Fixes #9
Merge pull request #11 from jking90/feature_neat

Fixes #9