Fixed bug with null reference exception.
Merge branch 'master' into gh-pages
Removed non-production files.