Use 1.9 style syntax
Merge branch 'master' of github.com:zencephalon/tekstflyt