Merge pull request #1 from mingchen/master

Updating from master
Credit fix for previous merge.
Link fix for credit fix for previous merge.
Merge pull request #15 from tsitra/master

Credit fix