Merge pull request #83 from eprogramming/master

Functional tests