Merge pull request #84 from tecknojock/master