Merge pull request #40 from tihansen/master

#33 merged
Merge pull request #2 from WOYM/master

Merge pull request #40 from tihansen/master