refactored, fixed fn name issue, rebuilt
1.3.0
Merge pull request #11 from KoryNunn/master

Refactor