up dating to make it a little more universal - A step into the future
Merge branch 'gh-pages'