Committing to resolve issue 74
Merge pull request #90 from binbin4649/issue-86-and-74

Committing to resolve issue 74