Fixed to release 0.3.6