Pushing new changes
Updated
Merge branch 'pull_cmanners_20140328091503208'