updates from rangathang-wm1(2) 140915
updates from wm1(2) for multiple whiskers 140923