Merge pull request #20 from XhmikosR/master

Readme and consistency updates.