Merge pull request #26 from XhmikosR/master

updates