Fixed #134 -- Added CLI interface