update
fix bugs
fix charts
Merge pull request #7 from krispo/master

update