jhpoelen Merge pull request #36 from mpadge/patch-1