Merge branch 'rel-0.6.4' into stable
Merge branch 'rel-0.6.2' into stable. close #6
Merge branch 'rel-0.6.1' into stable