mkottman Merge pull request #14 from mnicky/patch-1