Fixed many bugs
Merge branch 'develop'