to dev-master
Refactaring
spec refactaring