Added things @jesseDtucker mentioned. Hope it's enough
Merged Pull Request #43
Merged origin/master