Pushing new changes
Merge branch 'master' into pull_cbenien_20140811133321645
Updated