hot fixes
Merge pull request #29 from s3rcan/master2

hot fixes