Closes #5 Added functional tests.
Merge branch 'master' into ticket_5
Merge branch 'master' into ticket_5
Merge branch 'master' into ticket_5
Merge pull request #6 from reinetwork/ticket_5

Closes #5: Added functional tests.