Fixes #66
Merge remote-tracking branch 'origin/master' into bug_fixes
Merge pull request #75 from browserstack/bug_fixes

Fixes #66