Merge pull request #1 from criticalstack/develop

sync with upstream