Merge pull request #99 from TheSeven/master