Pushing new changes
Merge branch 'master' into pull_atpaton_20141113204455612