0.2.0 ready, fixes #5
conflict resolved