Fixed basic issues in script and added test data
Merge pull request #1 from nathansgreen/master

Fixed