Added a -o option (needed for mirari)
Merge pull request #2 from vbmithr/master

Added a -o option