Merge pull request #4 from stuycs-softdev/sofia

Sofia
Merge branch 'master' into sofia