diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0b79c16
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*.suo
+*.user
+Debug/*
+CommandCam/Debug/*
+*.pdb
+Photos
diff --git a/CommandCam.cpp b/CommandCam.cpp
index 929008e..c2461b0 100644
--- a/CommandCam.cpp
+++ b/CommandCam.cpp
@@ -27,6 +27,9 @@
 
 // DirectShow header file
 #include <dshow.h>
+#include <iostream>
+#include <ctime>
+#include <string.h>
 
 // This is a workaround for the missing header
 // file qedit.h which seems to be absent from the
@@ -98,7 +101,7 @@ int main(int argc, char **argv)
 	int device_number = 1;
 	char device_name[100];
 	char filename[100];
-	
+
 	// Other variables
 	char char_buffer[100];
 
@@ -159,6 +162,23 @@ int main(int argc, char **argv)
 				else
 				{
 					strcpy(filename, char_buffer);
+					
+					// idegani: add a timestamp in the filename if it contains wildcard {TS}
+					char *ts = strstr(filename, "{TS}");
+					if(ts != 0) {
+						char temp[100];
+						time_t rawtime;
+						struct tm * timeinfo;
+						size_t  dateLen;
+
+						time (&rawtime);
+						timeinfo = localtime(&rawtime);
+						strcpy(temp, ts + strlen("{TS}"));
+						// TODO: might be nice to have another cmd line arg where format can be specified
+						dateLen = strftime(ts, 80,"%Y-%m-%d_%H-%M-%S", timeinfo);
+						strcpy(ts + dateLen, temp);
+						int i = 4;
+					}
 				}
 			}
 			else exit_message("Error: no filename specified", 1);
diff --git a/CommandCam.exe b/CommandCam.exe
index d304a3e..23fce46 100644
Binary files a/CommandCam.exe and b/CommandCam.exe differ
diff --git a/CommandCam.sln b/CommandCam.sln
new file mode 100644
index 0000000..f8f5c12
--- /dev/null
+++ b/CommandCam.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommandCam", "CommandCam\CommandCam.vcxproj", "{5C02AC0A-FE24-465C-B3A5-155D642F62C5}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5C02AC0A-FE24-465C-B3A5-155D642F62C5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5C02AC0A-FE24-465C-B3A5-155D642F62C5}.Debug|Win32.Build.0 = Debug|Win32
+		{5C02AC0A-FE24-465C-B3A5-155D642F62C5}.Release|Win32.ActiveCfg = Release|Win32
+		{5C02AC0A-FE24-465C-B3A5-155D642F62C5}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/CommandCam/ClassDiagram1.cd b/CommandCam/ClassDiagram1.cd
new file mode 100644
index 0000000..0519ecb
--- /dev/null
+++ b/CommandCam/ClassDiagram1.cd
@@ -0,0 +1 @@
+ 
\ No newline at end of file
diff --git a/CommandCam/CommandCam.vcxproj b/CommandCam/CommandCam.vcxproj
new file mode 100644
index 0000000..b5244e9
--- /dev/null
+++ b/CommandCam/CommandCam.vcxproj
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5C02AC0A-FE24-465C-B3A5-155D642F62C5}</ProjectGuid>
+    <RootNamespace>CommandCam</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ole32.lib;strmiids.lib;oleaut32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>ole32.lib;strmiids.lib;oleaut32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\CommandCam.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ClassDiagram1.cd" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/CommandCam/CommandCam.vcxproj.filters b/CommandCam/CommandCam.vcxproj.filters
new file mode 100644
index 0000000..45e9ee1
--- /dev/null
+++ b/CommandCam/CommandCam.vcxproj.filters
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\CommandCam.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ClassDiagram1.cd" />
+  </ItemGroup>
+</Project>
\ No newline at end of file