Initial commit of 0.3

Ref #1
Ref #2