minor changes
Maybe fixed issue #143. Good hopes.....
Merge pull request #155 from tomvantilburg/master

merge from Tom