added a cool storing system
Merge branch 'master' into gh-pages