Merge pull request #239 from tbrisker/dev

fixing #233