More..
Merge pull request #23 from madevr/master

More..