stable
Added command-line options
Merge pull request #3 from mpath/working

Working