New : one function per fix, adrian fix, and add 2 new package for the issue #4