minicommit
merged master in strings