Merge pull request #72 from XhmikosR/master

various-4