Fixing bugs, adding features
Merge branch 'develop'