Removed postinstall
Merge branch 'develop'