refs #6 not free X(
Merge remote-tracking branch 'origin/release/v0.1' into release/v0.1