fix 20140604
Merge branch 'release/v0.3'