Merge pull request #35 from jvrdom/master

Merge from master.