Merge pull request #2 from pandincus/develop

Update from original
Merge pull request #1 from phantomtypist/develop

Merge pull request #2 from pandincus/develop