Fix #1. Add command line tool