Merge pull request #18 from stuycs-softdev/master

Merge pull request #17 from stuycs-softdev/Timothy
Merge pull request #19 from stuycs-softdev/Timothy

Merge pull request #18 from stuycs-softdev/master