Merge pull request #6 from avifoxi/initial-feature-tests

Initial feature tests
Merge branch 'master' into initial-feature-tests