Merge pull request #241 from jwendl/master

Merging changes to mainline.