Feature/beta version 0.1

Merge this branch as not a use of the feature branch strategy