Merge pull request #67 from jfeist/master

some small fixes