Consistency
Merge pull request #140 from iElectric/master

Consistency