Merge pull request #1 from jspark2014/master

Creating first pull request
Recommitting latest changes