Add buffer cmd; fix #201