Merge pull request #12 from ddunker/master

issue #9