rewrite for 2013-12-02 spec
update readme
demo merge