free pointer
Merge branch 'ws1314_1' into ws1314_2