Merge pull request #97 from cuss/master

master