begin of code refactoring
Bump to version 0.0.4