fixes #1 and #2
Merge pull request #4 from mhuttner/master

fixes #1 and #2