Merge pull request #3 from hgschmie/master

fixes for quartz
local fixes