Updated and tested code, so this should be a stable 0.1.0
Merge pull request #2 from svanharmelen/master

Updated and tested code, so this should be a stable 0.1.0