Bug Fixes 0.6 for index.html