Merge pull request #17 from goblin/master