Merge pull request #31 from aktse/master

merge conflicts