Fix #40
Merge branch 'develop' into issue-40
Merge branch 'develop' into feature-cli

Conflicts:
	requirements.txt