Merge pull request #15 from WOYM/master

Merge pull request #147 from tihansen/master
#154
Merge pull request #157 from tihansen/master

#154