Cleaning up spacing and indents
Merge tag '0.2.2' into develop

Fixing Composer
Update Composer.json