fix issues #114, #129
Merge branch 'gh-pages' of github.com:pfautrero/lector-dev into gh-pages