New test included
Merge branch 'master' of https://github.com/syanenko/common