Merge pull request #13 from XhmikosR/master

Various changes.