Elseif branch

Request to merge my branch to master. I'll handle it.