Merge pull request #60 from sot/proc_fixes

Processing fixes