Consistent state

Signed-off-by: Stanislav Láznička <slaz@seznam.cz>
Merge branch 'master' of ssh://github.com/Starigazdam/PIS2014