initial commit, first working version
** version 0.1 **
Merge branch 'develop'