Fixed context issue and missing break statement
Merge pull request #5 from johnstontrav/master

Fixed context issue and missing break statement;