added handlePlus, fixed line ending parsing