Merge pull request #9 from XhmikosR/master

Various