Merge pull request #25 from gcborders/master

Take Changes
Clean
Merge pull request #26 from gcborders/jim_backup

Clean up artifacts