Deleted commented method
Merge branch '1.0'