upgraded and merged to 0.6.13