Merge pull request #49 from Azelphur/master