Fix issue #64
Fix issue #65
Issue #65, make animation on load optional
Merge branch 'master' into gh-pages