Added quartz support + test #13