supporting dashes, added tests