Fix clear
Merge branch 'issue_26' into baleene-fixes