Corrected original repository link, fixes #14.
Corrected michaek username.
Merge remote-tracking branch 'upstream/master'