more stuff in master

Change-Id: I7f4b7815b1358a8ed93fddb40b7cbac432de7663
Merge branch 'master' of https://github.com/syosifov/str.git