Fix #28 Add download options to seperate file
Merge origin/master