Merge pull request #3 from Hube2/master

Update from master
fixed link
Merge pull request #4 from Hube2/Dev

Pull from Dev