Merge pull request #1 from ztnark/master

Pulling in Master from original repo
Merge pull request #69 from GeoffCrittenden/master

Merge pull request #1 from ztnark/master