more fixes, yay
merging from upstream
Merge pull request #17 from brack/master

merging and fixes