Merge pull request #1 from jlingema/master

Merge of recent changes