More tweaking...
Merge pull request #90 from madevr/madevr

More tweaking...
Merge pull request #91 from madevr/master

More tweaking...