Migrating From 0.8 to 0.9
Merge branch 'master' into dev
Merge branch 'master' into dev