release 0.0.3
Fixing merge conflict