Fixes..
Merge pull request #100 from madevr/madevr

Fixes..
Merge pull request #101 from madevr/master

Fixes..