diff --git a/src/core/scan.py b/src/core/scan.py
index d7a111a9..6295ca79 100644
--- a/src/core/scan.py
+++ b/src/core/scan.py
@@ -50,4 +50,9 @@ def run(args=None):
 	path = expandPath( space.join(args) )
 	#database.open()
 	scan(path)
+
+	count = str(database.count("files"))
+	write("Library contains "+count+" files.")
+
 	database.close()
+
diff --git a/src/core/tools/database.py b/src/core/tools/database.py
index 7e5a591b..2a15b4a8 100644
--- a/src/core/tools/database.py
+++ b/src/core/tools/database.py
@@ -67,4 +67,12 @@ def insert(file):
 	#c = conn.cursor()
 	t = (file,)
 	conn.execute('insert into files values(?)',t)
-	#c.close()
\ No newline at end of file
+	#c.close()
+
+
+def count(table):
+	global conn
+	if conn == None:
+		open()
+	result = conn.execute('select count(*) from '+ table)
+	return result.fetchone()[0]
\ No newline at end of file