Some fast fixes
Merge pull request #9 from Pycz/master

Some fast fixes