Add hsplit/vsplit choice; fix #4