Fixes #2 - added flags to modify output