Pushing new changes
Merge branch 'master' into pull_edmikeca_20140326150632404
Updated