bug fixes
Reverted
Merge pull request #76 from evitts/master

bug fixes