Merge updated f2euner
Merge branch 'master' of https://bitbucket.org/ejelome/canine