progress dialog
merged upstream
merged
Merge pull request #23 from herbatnik/master

progress dialog