Fix bug with parsing decimal.
Merge branch 'develop'