Fixed couple of bug
Merge pull request #140 from tomvantilburg/master

Fixed couple of bug