closes #46 #47 #48 #49
EDITED, MY LORD
Merge pull request #50 from Jerico174/master

closes #46 #47 #48 #49