unit tests
Merge pull request #66 from eprogramming/master

unit tests