Cur/wy/dev

Merge Request 2 03/12/14