Cleaned up
Merge in of specification from master gh-pages
Cleaned up