fixed #33
Merge branch 'bug/33-npe-cancel-geab-download' into dev