Merge pull request #233 from tomvantilburg/master

merge from Tom