linuxer friendly command line, fix #61
U: fix conflicts