Merge pull request #2 from trobert2/master

Added unit tests
Added test compatibility with python 2.6