Added customizable separator, fixed bugs