Merge pull request #45 from XhmikosR/master

Minor