Made changes for consistency
Merge pull request #27 from gabdallah222/master

Made changes for consistency - issues in #26 fixed.