bug fixes
more test comes
version update
Merge branch 'version-0.05'