Adding command line options and finishing test
Merge pull request #16 from DemandCube/dev/kingofpoptart

Adding command line options and finishing test