fix empty cell bug discovered at NECTW2014
Merge branch 'master' into gh-pages
'deploy'