Merge pull request #5 from sethkrasnianski/master

Merge goTo fix
Merge pull request #6 from sethkrasnianski/staging

Merge pull request #5 from sethkrasnianski/master