Changes made, based on meeting 9/15/2014
Merge pull request #4 from caliban19/master

Changes made, based on meeting 9/15/2014