Merge pull request #52 from badnack/development

forgot to push default pictures
Merge pull request #54 from badnack/development

Development
Merge remote-tracking branch 'upstream/development' into development