* Update calculations
* Fix image streching on firefox.
Merge remote-tracking branch 'origin/master'