Merge pull request #121 from paulcpederson/master

so much stuff.
fix scroll in firefox