Initial commit
Small fixes
Merge branch 'develop'