Pushing new changes
Merge branch 'master' into pull_atpaton_20141114112347497
Updated