Merge pull request #84 from eprogramming/master

functional test not part of unit test