Combined first working implementation
Merge pull request #2 from JCEmmons/master

Combined first working implementation