new version
fixed bugs
prototype v1
Merge branch 'develop'