fixed bakim .
Merge branch 'master' into autotools