#154
#150
Merge pull request #16 from WOYM/master

Update
Merge pull request #159 from tihansen/master

#150