Cleanup and Remove the blocker...

Didnt complicate things enough.. Not a great idea.. :D
Merge branch 'master' into gh-pages