fix #241
fix #162
Merge branch 'gh-pages' of github.com:breunigs/ingress-intel-total-conversion into gh-pages