Merge pull request #13 from bkargoll/master

Final^2 merge of Production_2014_Jan_21 into master