Close #35 + refactoring
support cat/echo..