vincent178 pull request
Merge pull request #15 from vincent178/master

READY: vincent178's pull request