Added tests
Merge pull request #37 from vasichkin/testing

Minor fixes, added tests.
Update setup.py
Merge pull request #38 from qubell/develop

Merge develop branch