Updates for version 0.6 tag