Merge pull request #9 from itsasquare/development

Development
Merge branch 'development'
image fix
Merge pull request #10 from itsasquare/development

Development
Merge pull request #11 from itsasquare/master

Merging upstream changes