Fixing #1263 and little bit refactoring
re-adding -help
Merge branch 'Issue_1263'