Merge pull request #27 from willietran/develop

Push to Master