Pull request solving #93