update
fix bug. build 130419
Merge branch 'master' into gh-pages