Merge pull request #71 from TylerBackman/master

backwards merge
fixed bug for single row data
Merge pull request #72 from TylerBackman/develop

Develop