Merge branch 'release/0.1.1' into develop
Do not consider s# to match device
Release version 0.1.2
Merge branch 'release/0.1.2'