Past changes consolidated, bumped to 0.2.0

Happy to hear your complains about my sort of rebased commits, happy merging ( :