seperate commands
add test for exception
Merge branch 'fix-exception'
add test case
more simply
Merge branch 'travis'