Merge pull request #87 from pdehaye/fix/trivial

Added unittest2
Merge branch 'master' into fix/trivial