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

More tweaking...