Improved support of nested states
Added screenshot