More cleanup..
Merge pull request #98 from madevr/madevr

More cleanup..