Pull request to master

Methods separated.