Merge pull request #7 from ddunker/master

issues #4 #5