daniel86 Merge pull request #356 from daniel86/owl-cleanup