fixed #24
fixed #23
fixed decimal type
Merge branch 'bugfix/issues' into develop