function improvement. version 0.9.2
Merge branch 'dev'