Merge pull request #84 from blackguest/master