Various inconsistencies fixed
Merge pull request #32 from rafalchmiel/master

Various inconsistencies fixed