Pushing new changes
Updated
Merge branch 'pull_jreyes20_20140326101907967'