Update 20140921

Fixed:
  - Why sleep in Makefile?
  - Free some pointers and hang up them
  - CLI looks better (maybe)