fixed not working bug
Merge pull request #8 from farfromguam/christopher

almost ready for public release