Update to version 0.3.6