Simplified
Merge pull request #1 from huntc/simplification

Simplified