Merge pull request #9 from dkorolev/master

Fixed naming inconsistency of 'current_'.