Merge pull request #7 from inugent/Production_2014_Jan_21

Production 2014 jan 21