pushing all files
fix some bugs
Merge pull request #9 from Kris-Simpson/tests

Tests