maxboeck Merge pull request #20 from harleykin/patch-1