implemented more in spec
Merge branch 'master' of github.com:Determinant/piztor