Bug Fixes 0.9 for index.html