update 10/29/2014
Merge remote-tracking branch 'upstream/master'

Pulled changes from original repo