Merge pull request #1 from zachjyoung/second

All is working, merging with master