Removing the count option passing code...
Merge branch 'issue_3' into issue_7