Squashed commit of the following:

commit a1670824340b2ac210b5a18a65229ace6746c6f6
Author: yuanboshe <yuanboshe@yeah.net>
Date:   Mon Jun 10 23:59:24 2013 -0400

    update

commit 934630e2e0ff7f9de25b4e09a446761eb8e8801c
Author: yuanboshe <yuanboshe@yeah.net>
Date:   Mon Jun 10 15:22:32 2013 -0400

    1.0