Merge pull request #262 from chris5560/master