Merge pull request #1 from bippity/master

Updated to 1,15
Fixes some noob-ass coding by me
Merge pull request #1 from WhiteXZ/master

Attempt to merge to own fork