added more testing
Merge pull request #30 from yenbryan/dev-bryan

whoa, lots of file changes