Some fixes here and there
Merge pull request #1 from pkrcel/master

Some fixes here and there.