Merge pull request #286 from shawno1059/master