Removed goto
Merge pull request #51 from michael-k/goto

Removed goto