Removed header as suggested by @ericof
Merge branch 'issue_253' into issue_255