Tweaking..
Merge pull request #88 from madevr/madevr

Tweaking..