Merge pull request #73 from XhmikosR/master

various