First draft of working version for upcomming release 0.1.0
Merge pull request #11 from mvala/master

First draft of working version for upcomming release 0.1.0