Merge pull request #43 from brianjmiller/master

Various fixes from Cross browser testing