Bug Fixes 0.2 for index.html