Adding flags.
Merge pull request #12 from matiasinsaurralde/master

Adding flags

Closes #11