Merge pull request #14 from Hube2/Dev

refresh from master