Merge pull request #3 from rive04-11-2/develop

Finished bug 1
Merge remote-tracking branch 'upstream/develop' into develop