consistency
Merge pull request #138 from iElectric/master

consistency