apply comments from PR 2 and 3
Merge pull request #5 from yammer/apply_PR_comments

apply comments from PR 2 and 3