updated url for api/v1.0, added image-dir
Merge remote-tracking branch 'refs/remotes/origin/master'