fixing model up a bit
Merge branch 'v1.0' into gh-pages