Fix Bug #2,3,4
Merge branch 'gh-pages'