Issue #91. Fix possible infinite loop
Close #91. Show usage in help command