Merge pull request #81 from SkyMist/master