Fixes #1, Fixes #6, Fixes #13; Skeleton for 0.2.0 :D