2 minor commits

hi simphax!

i fixed 2 of the issues i posted ( #35 and #36) myself. they are included in this pull request. feel free to pull the changes, if they are ok for you.

best wishes
mandark