Merge pull request #9 from invisiblefriend/develop

Add handling of base64 image data and other other minor tweaks