Merge branch 'release/0.3' into develop
fixed #27
Merge branch 'develop' # do not use develop any more