Merge pull request #30 from armm77/master

- Small correction version.
Flag correction
- small cleaning.