Lots o changes
Merge branch 'master' of https://github.com/forsythetony/PNChart

ok