Worked on #17
Did more Stuff
time:3
Merge pull request #1 from t73biz/develop

Worked on #17