Fix issues #69 and #70
Merge branch 'master' of github.com:jamesgao/pycortex