Merge pull request #2 from pandincus/develop

Update from original