Merge pull request #4 from Hube2/master

Refresh from Master
changed version
Merge pull request #5 from Hube2/Dev

Pull from Dev