#48: Price calculation
#48: Price calculation
Merge remote-tracking branch 'origin/dev' into dev