initial functional checkin
Merge branch 'hotfix/0.1.0'