#1 Merging development changes into gh-pages