Production version for the release 0.3.6