Merge pull request #9 from Hube2/Dev

refresh from master