Added the changes for cf and type flags.
Merge pull request #49 from SimonGoring/master

Added the changes for cf and type flags.