Switched to master version for new functionality