diff --git a/DIO2.zip b/DIO2.zip
index c25dac5..dcce940 100644
Binary files a/DIO2.zip and b/DIO2.zip differ
diff --git a/History/DIO2.1.5.1.zip b/History/DIO2.1.5.1.zip
index 041cf02..dcce940 100644
Binary files a/History/DIO2.1.5.1.zip and b/History/DIO2.1.5.1.zip differ
diff --git a/VStudio/DIO2.h b/VStudio/DIO2.h
index e54c192..df215b4 100644
--- a/VStudio/DIO2.h
+++ b/VStudio/DIO2.h
@@ -8,7 +8,23 @@
 #include "Arduino.h"
 //#include "ArduiEmulator.hpp"
 
+
+// Definitions specific for selected board
+#if defined(__AVR_ATmega2560__)
 #include "../board/mega/pins2_arduino.h"
+#else
+#if defined(__AVR_ATmega328P__)
+#include "../board/nano/pins2_arduino.h"
+#else
+#if defined(__AVR_ATmega32U4__)
+#include "../board/leonardo/pins2_arduino.h"
+#else
+#include "../board/standard/pins2_arduino.h"
+#endif
+#endif
+#endif
+
+//#include "../board/mega/pins2_arduino.h"
 
 extern void pinMode2(uint8_t pin, uint8_t mode);
 extern void digitalWrite2(uint8_t pin, uint8_t val);
diff --git a/VStudio/DIO2.vcxproj b/VStudio/DIO2.vcxproj
index 38ed8ce..7289034 100644
--- a/VStudio/DIO2.vcxproj
+++ b/VStudio/DIO2.vcxproj
@@ -103,7 +103,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_LIB;VISUALSTUDIO;ARDUINO_AVR_MEGA2560;_DIO2_EXPORTING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;_LIB;VISUALSTUDIO;_DIO2_EXPORTING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>$(VisualStudioDir)\..\Arduino\ArduiEmulatorWin\ArduiEmulatorLib</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
diff --git a/library.properties b/library.properties
index b3cc852..a11d149 100644
--- a/library.properties
+++ b/library.properties
@@ -5,5 +5,5 @@ maintainer=Thierry Paris - Locoduino
 sentence=Fast digital input/output functions.
 paragraph=From a work of Jan Dolinay
 category=Device Control
-url=https://github.com/Locoduino.org/DIO2
+url=https://github.com/Locoduino/DIO2
 architectures=avr,sam,esp32,STM32F1
diff --git a/src/DIO2.h b/src/DIO2.h
index 1325b59..c7cadfc 100644
--- a/src/DIO2.h
+++ b/src/DIO2.h
@@ -83,7 +83,7 @@ static inline void digitalWrite2f(GPIO_pin_t pin, uint8_t value);
 	#define		GPIO2_USE_INLINE_FUNCTIONS	0
 #endif
 
-// Note: ATOMIC_BLOCK is macro in AVR Libc, but it cannot be used in current Arduino verison
+// Note: ATOMIC_BLOCK is macro in AVR Libc, but it cannot be used in current Arduino version
 // (1.0.5-r2), because the compiler options are not set to support C99 standard.
 // That is why there is our own version for now
 #define	GPIO2_ATOMIC_BEGIN		{ uint8_t matom_oldSREG = SREG; cli();