Changed goTo() to return an enum
Merge origin/master