Merge pull request #99 from Watchful1/master

Merge, again
wat
1.1.3
1.1.3 again?
Merge pull request #100 from Watchful1/dev

Dev - update, again