Merge pull request #109 from Kekun/master