methods refactored
Merge branch 'patch'