Merge pull request #49 from TheFireMike/master