Changed int to decimal fields
Merge branch 'development'