Merge branch 'hotfix/0.1.0_merge_bug'
 Fixed a bug in requirements.txt
Merge branch 'hotfix/0.1.1' into develop