Fix unit tests
Merge
Small cleanup
Small cleanup
Merge branch 'master' of https://github.com/Inviti/inviti
Roman's patch
Merge pull request #18 from quixxxy/master

Roman's patch