fixed descriptions
fixed test script
Merge pull request #1 from sydlawrence/master

Total refactor