Update 20141001

Bunch of changes