Merge pull request #148 from scrollback/bug-fixes

Analytics bug fixes
Merge pull request #149 from scrollback/bug-fixes

typo fix, trim action.text
Merge branch 'master' into bug-fixes