A fix for issue #23
Added download link for issue #6
Merge branches 'master' and 'fixupload'
Merge branches 'master' and 'addlink'