Fix #18
Merge pull request #19 from mpvharmelen/master

Fix #18