final commit message, bug fixes
Merge pull request #8 from trfergusASU/master

final commit message, bug fixes