diff --git a/apktool-lib/pom.xml b/apktool-lib/pom.xml
index 9d3096d4..e8114960 100644
--- a/apktool-lib/pom.xml
+++ b/apktool-lib/pom.xml
@@ -83,11 +83,23 @@
             <groupId>brut.apktool.smali</groupId>
             <artifactId>smali</artifactId>
             <version>${smaliVersion}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>dexlib</artifactId>
+                    <groupId>brut.apktool.smali</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>brut.apktool.smali</groupId>
             <artifactId>baksmali</artifactId>
             <version>${smaliVersion}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>dexlib</artifactId>
+                    <groupId>brut.apktool.smali</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>brut.apktool.smali</groupId>
@@ -107,13 +119,24 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.2</version>
+            <version>4.10</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>hamcrest-core</artifactId>
+                    <groupId>org.hamcrest</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>xmlunit</groupId>
             <artifactId>xmlunit</artifactId>
             <version>1.3</version>
         </dependency>
+        <dependency>
+            <groupId>brut.apktool.smali</groupId>
+            <artifactId>dexlib</artifactId>
+            <version>1.3.4-ibot7</version>
+        </dependency>
     </dependencies>
 
     <pluginRepositories>
diff --git a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResLayoutValue.java b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResLayoutValue.java
index 0938d3aa..f86ba049 100644
--- a/apktool-lib/src/main/java/brut/androlib/res/data/value/ResLayoutValue.java
+++ b/apktool-lib/src/main/java/brut/androlib/res/data/value/ResLayoutValue.java
@@ -1,18 +1,19 @@
 /**
- * Copyright 2011 Ryszard Wiśniewski <brut.alll@gmail.com>
+ *  Copyright 2011 Ryszard Wiśniewski <brut.alll@gmail.com>
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
  */
+
 package brut.androlib.res.data.value;
 
 import brut.androlib.AndrolibException;