no need for gotos...
Merge pull request #29 from tekknolagi/master

no need for gotos...