A few fixes
fixes a mistake of my own
Merge pull request #1 from dodev/master

A few fixes from @dodev