Merge pull request #2 from CS673F14P4/develop

Merge pull request #1 from CS673F14P4/master