bug fixes
Merge branch 'master' of https://github.com/hello-mean/glsec-2014