master commit fixed
12/12/14
12/12/14
Merge remote-tracking branch 'origin/master'
12/12/14