Fix bugs with charting
Merge branch 'master' of https://github.com/vlad92z/Team-Fifty-Four