v0.1a complete
Merge remote-tracking branch 'origin/master'