diff --git a/importPicture/README.jp.txt b/importPicture/README.jp.txt
index 61f4531..487cefc 100644
--- a/importPicture/README.jp.txt
+++ b/importPicture/README.jp.txt
@@ -20,7 +20,7 @@
 	 argv[1] = 画像ファイルが格納されているディレクトリ
 	 argv[2] = 時刻補正の基準とする画像ファイル
 	 argv[3] = 基準画像ファイルの精確な撮影日時 "yyyy-mm-dd'T'HH:MM:ss"
-	 argv[4] = 撮影位置をロギングしたGPXファイル
+	 argv[4] = 撮影位置をロギングしたGPXファイル	(省略可能：省略した場合は指定された画像ディレクトリ内のGPXファイルを対象とする（複数可能）)
 
 exp)
 
diff --git a/importPicture/src/osm/jp/gpx/ImportPicture.java b/importPicture/src/osm/jp/gpx/ImportPicture.java
index b5e7520..bf454d2 100644
--- a/importPicture/src/osm/jp/gpx/ImportPicture.java
+++ b/importPicture/src/osm/jp/gpx/ImportPicture.java
@@ -2,6 +2,7 @@
 import java.io.*;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Date;
@@ -54,8 +55,27 @@
 		}
 
 		if (argv.length < 4) {
-			System.out.println("> java -jar importPicture.jar <outputfile> <targetDir> <time base image> <time> <gpx>");
-			System.out.println("> java -jar importPicture.jar list.csv . IMG_01234.JPG 2012-06-15T12:52:22 鎌倉宮_2012-06-15_12-00-16.gpx");
+			System.out.println("> java -jar importPicture.jar <outputfile> <targetDir> <time base image> <time> (gpx)");
+			System.out.println("> java -jar importPicture.jar list.csv . IMG_01234.JPG 2012-06-15T12:52:22");
+		}
+		
+		// 第５引数が指定されなければ、指定されたディレクトリ内のGPXファイルすべてを対象とする
+		ArrayList<File> gpxFiles = new ArrayList<File>();
+		if (argv.length > 4) {
+			gpxFiles.add(new File(dir, argv[4]));
+		}
+		else {
+			File[] files = dir.listFiles();
+			for (int i=0; i < files.length; i++) {
+				if (files[i].isFile()) {
+					String filename = files[i].getName().toUpperCase();
+					if (filename.endsWith(".GPX")) {
+						if (!filename.endsWith("_.GPX")) {
+							gpxFiles.add(files[i]);
+						}
+					}
+				}
+			}
 		}
 
 		/**
@@ -74,128 +94,129 @@
 		 */
 		DocumentBuilderFactory factory;
 		DocumentBuilder        builder;
-
 		Node gpx;
-		File gpxFile = new File(argv[4]);
-
-		String fileName = gpxFile.getName();
-		String iStr = fileName.substring(0, fileName.length() - 4);
-
-		File outputFile = new File(gpxFile.getParent(), iStr +"_.gpx");
-		System.out.println(iStr + " => "+ outputFile.getName());
-
+		
 		try {
-			factory = DocumentBuilderFactory.newInstance();
-			builder = factory.newDocumentBuilder();
-			factory.setIgnoringElementContentWhitespace(true);
-			factory.setIgnoringComments(true);
-			factory.setValidating(true);
+			for (int gpxCnt = 0; gpxCnt < gpxFiles.size(); gpxCnt++) {
+				File gpxFile = gpxFiles.get(gpxCnt);
+				String fileName = gpxFile.getName();
+				String iStr = fileName.substring(0, fileName.length() - 4);
+	
+				File outputFile = new File(gpxFile.getParent(), iStr +"_.gpx");
+				System.out.println(iStr + " => "+ outputFile.getName());
 
-			// GPX file --> Node root
-			DOMImplementation domImpl = builder.getDOMImplementation();
-			document = domImpl.createDocument("", "gpx", null);
+				factory = DocumentBuilderFactory.newInstance();
+				builder = factory.newDocumentBuilder();
+				factory.setIgnoringElementContentWhitespace(true);
+				factory.setIgnoringComments(true);
+				factory.setValidating(true);
 
-			/*
-			<gpx>
-				<trk>
-					<name><![CDATA[Tracked with OSMTracker for Android?]]></name>
-					<cmt><![CDATA[警告: HDOP values aren't the HDOP as returned by the GPS device. They're approximated from the location accuracy in meters.]]></cmt>
-					<trkseg>
-						<trkpt lat="35.32123832" lon="139.56965631">
-							<ele>47.20000076293945</ele>
-							<time>2012-06-15T03:00:29Z</time>
-							<hdop>0.5</hdop>
-						</trkpt>
-					</trkseg>
-				</trk>
-				<wpt lat="35.2564461" lon="139.15437809">
-				</wpt>
-			</gpx>
-			*/
-			Element trk = null;
-			gpx    = builder.parse(gpxFile).getFirstChild();
-			NodeList nodes = gpx.getChildNodes();
-			for (int i=0; i < nodes.getLength(); i++) {
-				Node node2 = nodes.item(i);
-				if (node2.getNodeName().equals("trk")) {
-					trk = (Element) node2;
-				}
-			}
+				// GPX file --> Node root
+				DOMImplementation domImpl = builder.getDOMImplementation();
+				document = domImpl.createDocument("", "gpx", null);
 
-			if (trk != null) {
-				HashMap<Long,Element> map = trkptMap(trk);
-				File baseFile = new File(dir, argv[2]);
-				Date jptime = new Date(baseFile.lastModified());
-
-				PrintWriter pw = new PrintWriter(new BufferedWriter(new FileWriter(csvfile)));
-				String timeStr = argv[3];
-				try {
-					Date t = dfjp.parse(timeStr);
-					long delta = t.getTime() - jptime.getTime();
-					
-					/*
-					 * GPXへ割りつける開始時刻と終了時刻を求める
-					 */
-					long gpxStartTime = (new Date()).getTime();	// 対象とする開始時刻
-					long gpxEndTime = 0L;							// 対象とする終了時刻
-					Set<Long> keySet = map.keySet();  //すべてのキー値を取得
-					for (Iterator<Long> keyIte = keySet.iterator(); keyIte.hasNext();) {
-						Long timeLong = (Long)keyIte.next();
-						long gpxTime = timeLong.longValue();
-						if (gpxStartTime > gpxTime) {
-							gpxStartTime = gpxTime;
-						}
-						if (gpxEndTime < gpxTime) {
-							gpxEndTime = gpxTime;
-						}
+				/*
+				<gpx>
+					<trk>
+						<name><![CDATA[Tracked with OSMTracker for Android?]]></name>
+						<cmt><![CDATA[警告: HDOP values aren't the HDOP as returned by the GPS device. They're approximated from the location accuracy in meters.]]></cmt>
+						<trkseg>
+							<trkpt lat="35.32123832" lon="139.56965631">
+								<ele>47.20000076293945</ele>
+								<time>2012-06-15T03:00:29Z</time>
+								<hdop>0.5</hdop>
+							</trkpt>
+						</trkseg>
+					</trk>
+					<wpt lat="35.2564461" lon="139.15437809">
+					</wpt>
+				</gpx>
+				*/
+				Element trk = null;
+				gpx    = builder.parse(gpxFile).getFirstChild();
+				NodeList nodes = gpx.getChildNodes();
+				for (int i=0; i < nodes.getLength(); i++) {
+					Node node2 = nodes.item(i);
+					if (node2.getNodeName().equals("trk")) {
+						trk = (Element) node2;
 					}
-					
-					System.out.println("時差： "+ (delta / 1000) +"(sec)");
-					pw.println("           時差： "+ (delta / 1000) +"(sec)");
-					pw.println("    Target GPX： ["+ gpxFile.getName() +"]");
-					pw.println("GPX start time： "+ dfjp.format(new Date(gpxStartTime).getTime()));
-					pw.println("  GPX end time： "+ dfjp.format(new Date(gpxEndTime).getTime()));
+				}
 
-					pw.println("\"name\",\"orignal\",\"gpstime\"");
-					File[] files = dir.listFiles();
-					Arrays.sort(files, new FileSort());
-					for (File image : files) {
-						String imageName = image.getName();
-						if (checkFile(imageName)) {
-							Date itime = new Date(image.lastModified());
-							Date uktime = new Date(itime.getTime() + delta);
-							if ((uktime.getTime() >= gpxStartTime) && (uktime.getTime() <= gpxEndTime)) {
-								Element trkpt = trkpt(map, uktime);
-								if (trkpt != null) {
-									pw.print("\""+ image.getName() +"\",");
-									pw.print("\""+ dfjp.format(itime) +"\",");
-									pw.println("\""+ dfjp.format(uktime) +"\"");
+				if (trk != null) {
+					HashMap<Long,Element> map = trkptMap(trk);
+					File baseFile = new File(dir, argv[2]);
+					Date jptime = new Date(baseFile.lastModified());
 
-									Element wpt = createWptTag(dir, image, uktime.getTime(), trkpt);
-									Element temp = getCopy(gpx.getOwnerDocument(), wpt);
-									gpx.appendChild(temp);
+					PrintWriter pw = new PrintWriter(new BufferedWriter(new FileWriter(csvfile)));
+					String timeStr = argv[3];
+					try {
+						Date t = dfjp.parse(timeStr);
+						long delta = t.getTime() - jptime.getTime();
+						
+						/*
+						 * GPXへ割りつける開始時刻と終了時刻を求める
+						 */
+						long gpxStartTime = (new Date()).getTime();	// 対象とする開始時刻
+						long gpxEndTime = 0L;							// 対象とする終了時刻
+						Set<Long> keySet = map.keySet();  //すべてのキー値を取得
+						for (Iterator<Long> keyIte = keySet.iterator(); keyIte.hasNext();) {
+							Long timeLong = (Long)keyIte.next();
+							long gpxTime = timeLong.longValue();
+							if (gpxStartTime > gpxTime) {
+								gpxStartTime = gpxTime;
+							}
+							if (gpxEndTime < gpxTime) {
+								gpxEndTime = gpxTime;
+							}
+						}
+						
+						System.out.println("時差： "+ (delta / 1000) +"(sec)");
+						pw.println("           時差： "+ (delta / 1000) +"(sec)");
+						pw.println("    Target GPX： ["+ gpxFile.getName() +"]");
+						pw.println("GPX start time： "+ dfjp.format(new Date(gpxStartTime).getTime()));
+						pw.println("  GPX end time： "+ dfjp.format(new Date(gpxEndTime).getTime()));
+
+						pw.println("\"name\",\"orignal\",\"gpstime\"");
+						File[] files = dir.listFiles();
+						Arrays.sort(files, new FileSort());
+						for (File image : files) {
+							String imageName = image.getName();
+							if (checkFile(imageName)) {
+								Date itime = new Date(image.lastModified());
+								Date uktime = new Date(itime.getTime() + delta);
+								if ((uktime.getTime() >= gpxStartTime) && (uktime.getTime() <= gpxEndTime)) {
+									Element trkpt = trkpt(map, uktime);
+									if (trkpt != null) {
+										pw.print("\""+ image.getName() +"\",");
+										pw.print("\""+ dfjp.format(itime) +"\",");
+										pw.println("\""+ dfjp.format(uktime) +"\"");
+
+										Element wpt = createWptTag(dir, image, uktime.getTime(), trkpt);
+										Element temp = getCopy(gpx.getOwnerDocument(), wpt);
+										gpx.appendChild(temp);
+									}
 								}
 							}
 						}
 					}
+					catch (ParseException e) {
+						System.out.println("'"+ timeStr +"' の書式が違います(yyyy-MM-dd'T'HH:mm:ss)");
+					}
+					finally {
+						pw.close();
+					}
 				}
-				catch (ParseException e) {
-					System.out.println("'"+ timeStr +"' の書式が違います(yyyy-MM-dd'T'HH:mm:ss)");
-				}
-				finally {
-					pw.close();
-				}
-			}
 
-			// 出力
-			DOMSource source = new DOMSource(gpx);
-			FileOutputStream os = new FileOutputStream(outputFile);
-			StreamResult result = new StreamResult(os);
-			TransformerFactory transFactory = TransformerFactory.newInstance();
-			Transformer transformer = transFactory.newTransformer();
-			transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-			transformer.setOutputProperty(OutputKeys.METHOD, "xml");
-			transformer.transform(source, result);
+				// 出力
+				DOMSource source = new DOMSource(gpx);
+				FileOutputStream os = new FileOutputStream(outputFile);
+				StreamResult result = new StreamResult(os);
+				TransformerFactory transFactory = TransformerFactory.newInstance();
+				Transformer transformer = transFactory.newTransformer();
+				transformer.setOutputProperty(OutputKeys.INDENT, "yes");
+				transformer.setOutputProperty(OutputKeys.METHOD, "xml");
+				transformer.transform(source, result);
+			}
 		}
 		catch (ParserConfigurationException e) {
 			e.printStackTrace();