framework fix | 0.1 | n.shleenkov
Merge remote-tracking branch 'origin/master'