Fix Issue #5 #6 #7 #8 #9
Merge branch 'master' into gh-pages