More fixes
Merge pull request #92 from madevr/madevr

More fixes
Merge pull request #93 from madevr/master

More fixes...