Updates 11/18/14
Update 11/19/14
Merge pull request #3 from devinmatte/master

Master