Resolve merge conflicts for stronger typing
Merge pull request #5 from trevorsmith86/master

Resolve merge conflicts for stronger typing