Updated.
Updated to version 0.5
Merge branch 'develop'