Merge pull request #8 from XhmikosR/master

Minor improvements (3)