Spec improvements, code style...
Bump 0.2.1