improved user interface, fixed #8