J04 Added stack
Merge branch 'ydanylchenko'