fixed a small bug, added some comments
Authored by: juliakern 2014-10-01
Parent: [r30448]
Child: [r30450]