Merge pull request #51 from XhmikosR/devel