FIX: Dependency issue and release 0.04