Update snippets to include flat version.
Update extractor and remove newline
Merge pull request #17 from cheunghy/master

Update snippets to include flat version.