Merge pull request #1 from ztnark/master

Pulling in Master from original repo