v0.6.5 update
merge master, v0.6.5-limited