Merge pull request #80 from XhmikosR/master

Minor improvements