Merge pull request #13 from paazmaya/master

Update
Link update
Merge pull request #159 from jukra/master

Link update