Finished work on 27/10-13 and merging into gh-pages