More fixes
Merge pull request #92 from madevr/madevr

More fixes