Merge pull request #174 from XhmikosR/master

Minor improvements.