closes #17; fixed seperator bug