fixed #24, fixed #25, updated manpage for #11