updates
Merge branch 'master' of https://github.com/cimar/maplight_1.0

ht_1.0