Merge pull request #36 from TheFireMike/master