Merge pull request #107 from termim/master