merge updates from jelenhu.github.io repo