Merge pull request #19 from morrislaptop/master

Fix a couple of issues
Merge cleanup
Update Toolkit [#15]
1.3.0