working version of basic, bare-bone stub
Merge branch 'release/0.1'