Merge pull request #25 from dwenzel/dev

merge Dev into master 
Version 0.2.1
version 0.2.1, beta status
merged dev into release/0.3
Merge pull request #30 from dwenzel/release/0.3

Release/0.3
version 0.3
Merge branch 'master' into release/0.4