Merge pull request #48 from rickcarlino/master

May 22nd
SkyNet fiddling