Merge pull request #1 from brianedgerton/master

Core functionality.