Improved image picker. Fixes #15 and #16