diff --git a/.gitignore b/.gitignore
index 29195b7..af06fdb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,6 @@ target
 gradle/
 libraries/
 gradlew
-gradlew.bat
\ No newline at end of file
+gradlew.bat
+
+logs/
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 255f71f..b92dd1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,9 +16,33 @@
         <jar.main.class>net.juniper.netconf</jar.main.class>
     </properties>
 
-    <build>
-        <sourceDirectory>src/main/java</sourceDirectory>
+    <name>${project.groupId}:${project.artifactId}</name>
+    <description>An API For NetConf client</description>
+    <url>https://github.com/Juniper/netconf-java</url>
+
+    <licenses>
+        <license>
+            <name>BSD 2</name>
+            <url>https://opensource.org/licenses/BSD-2-Clause</url>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>Juniper Staff</name>
+            <email>ldo@juniper.net</email>
+            <organization>Juniper</organization>
+            <organizationUrl>https://github.com/Juniper</organizationUrl>
+        </developer>
+    </developers>
+
+    <scm>
+        <connection>scm:git:git://github.com/Juniper/netconf-java.git</connection>
+        <developerConnection>scm:git:ssh://github.com:Juniper/netconf-java.git</developerConnection>
+        <url>https://github.com/Juniper/netconf-java/tree/master</url>
+    </scm>
 
+    <build>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -59,21 +83,48 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
-
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.1.0</version>
-                <configuration>
-                    <show>private</show>
-                    <nohelp>true</nohelp>
-                    <reportOutputDirectory>${basedir}</reportOutputDirectory>
-                    <destDir>javadoc</destDir>
-                    <stylesheet>java</stylesheet>
-                    <bottom><![CDATA[Copyright 2018, <a href="https://www.juniper.net">Juniper Networks, Inc.<a>]]> </bottom>
-                </configuration>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <stylesheet>java</stylesheet>
+                            <bottom><![CDATA[Copyright 2018, <a href="https://www.juniper.net">Juniper Networks, Inc.<a>]]> </bottom>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>javadoc</id>
+                        <goals>
+                            <goal>javadoc</goal>
+                        </goals>
+                        <configuration>
+                            <show>private</show>
+                            <nohelp>true</nohelp>
+                            <reportOutputDirectory>${basedir}</reportOutputDirectory>
+                            <destDir>javadoc</destDir>
+                            <stylesheet>java</stylesheet>
+                            <bottom><![CDATA[Copyright 2018, <a href="https://www.juniper.net">Juniper Networks, Inc.<a>]]> </bottom>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
-
         </plugins>
     </build>
 
@@ -104,7 +155,7 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
+            <artifactId>slf4j-log4j12</artifactId>
             <version>1.7.12</version>
         </dependency>
 
diff --git a/src/main/java/net/juniper/netconf/Device.java b/src/main/java/net/juniper/netconf/Device.java
index 2c978a6..e6b2640 100644
--- a/src/main/java/net/juniper/netconf/Device.java
+++ b/src/main/java/net/juniper/netconf/Device.java
@@ -55,7 +55,7 @@
  */
 @Slf4j
 @Getter
-public class Device {
+public class Device implements AutoCloseable {
 
     private static final int DEFAULT_NETCONF_PORT = 830;
     private static final int DEFAULT_TIMEOUT = 5000;
@@ -315,6 +315,7 @@ private boolean isSessionConnected() {
      * sessions will be closed, too. Can be called at any time. Don't forget to
      * call this once you don't need the device anymore.
      */
+    @Override
     public void close() {
         if (!isConnected()) {
             return;
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
new file mode 100644
index 0000000..1a82368
--- /dev/null
+++ b/src/main/resources/log4j.properties
@@ -0,0 +1,16 @@
+# Root logger option
+log4j.rootLogger=DEBUG, file, stdout
+
+# Direct log messages to a log file
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=logs/main.log
+log4j.appender.file.MaxFileSize=100MB
+log4j.appender.file.MaxBackupIndex=10
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
\ No newline at end of file
diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties
new file mode 100644
index 0000000..a54c146
--- /dev/null
+++ b/src/test/resources/log4j.properties
@@ -0,0 +1,16 @@
+# Root logger option
+log4j.rootLogger=DEBUG, file, stdout
+
+# Direct log messages to a log file
+log4j.appender.file=org.apache.log4j.RollingFileAppender
+log4j.appender.file.File=logs/test.log
+log4j.appender.file.MaxFileSize=100MB
+log4j.appender.file.MaxBackupIndex=10
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n
\ No newline at end of file