Merge pull request #7 from XhmikosR/master

Minor fixes