Merge pull request #11 from henux/master