Updated to API 0.3
Merge branch 'develop'