Merge pull request #2 from indirect/develop