flag fix
Merge pull request #159 from Birni/master

flag fix