merging latest changes
updating code
Merge pull request #185 from ChristianMurphy/gh-pages

merging latest code to demo server