Merge pull request #109 from rotanid/master