Merge pull request #40 from tihansen/master

#33 merged