Merge pull request #3 from tcsorcs/master

Updating 12/9/14