Fixed re#1
Merge branch 'features/f3'