nasty fixes
Merge pull request #12 from snoweye/master

nasty fixes