new feature in upstream
Merge pull request #1 from logiclocker/feature2

new feature in upstream