Committing to complete issues
Merge pull request #88 from binbin4649/issue-86-and-74

Committing to complete issues