Merge pull request #5 from cvhf/master

please merge