Merge pull request #1 from ngs/cucumber-tests

Cucumber tests
universal code
Merge pull request #15 from ngs/universal-code

Universal code support