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

More cleanup..
Merge pull request #99 from madevr/master

More cleanup..