Initial checkin
Updated to make initialization simpler
Merge branch 'release/0.1.0'