fixed #23
Merge pull request #30 from starteam/feature/issue_23

Fixed #23
Formatting changes
Working on 2 decimal points, issue #22
Formatting
Fixed #22
Fixed #22 for real :)
Fixed #21
Merge pull request #31 from starteam/develop

Fixed issues #23, #22, #21, #26