Add various stuff
Merge pull request #22 from madevr/master

Add various stuff