Fixed bug with protect
Merge fixed version 1.0 to master
Merge branch 'dev'