committing w eric changes :)
Merge remote-tracking branch 'bathtub/master'