Updated code for consistency
Merge pull request #38 from MichaelZaporozhets/consistency-patch

Updated code for consistency