updated with proper urls
version +
Merge branch 'master' into develop
v0.0.6