Feature/validate price mapping

Bug fix: [yes]
Feature addition: [yes]
Backwards compatibility break: [no]
Unit test passes: [yes]
Checkstyle issues: [no]
ChangeLog updated: [yes]
Fixes the following issues : #13