Issue 104, fixing reviewers comments