Merge pull request #65 from XhmikosR/master

various-3