Fix ISSUE #14
Merge pull request #21 from fbergkemper/master

Fix ISSUE #14