Merge pull request #58 from XhmikosR/master

Various-2