diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..80a74ec14d53eb290c72cd08f8fe13499e8e258c
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,14 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.bstek.ureport</groupId>
+	<artifactId>ureport2</artifactId>
+	<version>2.0.5</version>
+	<packaging>pom</packaging>
+	<modules>
+		<module>ureport2-parent</module>
+		<module>ureport2-core</module>
+		<module>ureport2-console</module>
+		<module>ureport2-font</module>
+	</modules>
+</project>
\ No newline at end of file
diff --git a/ureport2-core/src/main/java/com/bstek/ureport/utils/ElCalculator.java b/ureport2-core/src/main/java/com/bstek/ureport/utils/ElCalculator.java
index 0ca317dfe05ab42db1a4a79104618a2924797064..2c4435260b005758dffa2f86938e0ab76317acce 100644
--- a/ureport2-core/src/main/java/com/bstek/ureport/utils/ElCalculator.java
+++ b/ureport2-core/src/main/java/com/bstek/ureport/utils/ElCalculator.java
@@ -212,7 +212,7 @@ public class ElCalculator {
 			}else if(currentOp=='/' && msg.indexOf("by zero")!=-1){
 				result = "Infinity";
 			}else{
-				throw ex;							
+				throw new RuntimeException(ex);
 			}
         }
         return result;
diff --git a/ureport2-font/pom.xml b/ureport2-font/pom.xml
index 8f5e72cf0603444175671d1e7ecd0946eea20d40..ba1aa05b189194dadb81c1ec446066fe96afaed4 100644
--- a/ureport2-font/pom.xml
+++ b/ureport2-font/pom.xml
@@ -4,7 +4,7 @@
   <parent>
   	<groupId>com.bstek.ureport</groupId>
   	<artifactId>ureport2-parent</artifactId>
-  	<version>2.0.1</version>
+  	<version>2.0.5</version>
   </parent>
   <dependencies>
   	<dependency>
diff --git a/ureport2-parent/pom.xml b/ureport2-parent/pom.xml
index d96e1d40091c2bedef10e65742a89c15036dce1f..3e5926a28f04a794f003dba70f4bce10194a827e 100644
--- a/ureport2-parent/pom.xml
+++ b/ureport2-parent/pom.xml
@@ -1,183 +1,189 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.bstek.ureport</groupId>
-	<artifactId>ureport2-parent</artifactId>
-	<version>2.0.5</version>
-	<packaging>pom</packaging>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-	<licenses>
-		<license>
-			<name>The Apache License, Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-		</license>
-	</licenses>
-	<developers>
-		<developer>
-			<name>Gaojie</name>
-			<email>jacky.gao@bstek.com</email>
-			<organization>Bstek</organization>
-			<organizationUrl>http://www.bstek.com</organizationUrl>
-		</developer>
-	</developers>
-	<scm>
-		<connection>https://github.com/youseries/ureport.git</connection>
-		<developerConnection>https://github.com/youseries/ureport.git</developerConnection>
-		<url>https://github.com/youseries/ureport</url>
-	</scm>
-	<organization>
-		<name>Bstek</name>
-		<url>http://www.bstek.com</url>
-	</organization>
-	<build>
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<includes>
-					<include>**/*.jar</include>
-					<include>**/*.xml</include>
-					<include>**/*.xsd</include>
-					<include>**/*.schemas</include>
-					<include>**/*.handlers</include>
-					<include>**/*.properties</include>
-					<include>**/*.png</include>
-					<include>**/*.jpg</include>
-					<include>**/*.gif</include>
-					<include>**/*.css</include>
-					<include>**/*.js</include>
-					<include>**/*.map</include>
-					<include>**/*.swf</include>
-					<include>**/*.swz</include>
-					<include>**/*.html</include>
-					<include>**/*.jsp</include>
-					<include>**/*.txt</include>
-					<include>**/*.eot</include>
-					<include>**/*.svg</include>
-					<include>**/*.ttf</include>
-					<include>**/*.ttc</include>
-					<include>**/*.TTF</include>
-					<include>**/*.TTC</include>
-					<include>**/*.woff</include>
-					<include>**/*.md</include>
-					<include>**/*.template</include>
-				</includes>
-			</resource>
-			<resource>
-				<directory>src/main/java</directory>
-				<includes>
-					<include>**/*.xml</include>
-					<include>**/*.xsd</include>
-					<include>**/*.schemas</include>
-					<include>**/*.handlers</include>
-					<include>**/*.properties</include>
-					<include>**/*.png</include>
-					<include>**/*.jpg</include>
-					<include>**/*.gif</include>
-					<include>**/*.css</include>
-					<include>**/*.js</include>
-					<include>**/*.map</include>
-					<include>**/*.html</include>
-					<include>**/*.jsp</include>
-					<include>**/*.txt</include>
-					<include>**/*.eot</include>
-					<include>**/*.svg</include>
-					<include>**/*.ttf</include>
-					<include>**/*.ttc</include>
-					<include>**/*.TTF</include>
-					<include>**/*.TTC</include>
-					<include>**/*.woff</include>
-					<include>**/*.md</include>
-					<include>**/*.template</include>
-				</includes>
-			</resource>
-		</resources>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.4</version>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-					<encoding>utf-8</encoding>
-				</configuration>
-			</plugin>
-			<plugin>
-			  <groupId>org.apache.maven.plugins</groupId>
-			  <artifactId>maven-release-plugin</artifactId>
-			  <version>2.5.3</version>
-			</plugin>			
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
-				<extensions>true</extensions>
-				<configuration>
-					<serverId>ossrh</serverId>
-					<nexusUrl>https://oss.sonatype.org/</nexusUrl>
-					<autoReleaseAfterClose>true</autoReleaseAfterClose>
-				</configuration>
-			</plugin>
-			<plugin>
-		      <groupId>org.apache.maven.plugins</groupId>
-		      <artifactId>maven-source-plugin</artifactId>
-		      <version>2.2.1</version>
-		      <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>2.9.1</version>
-		      <executions>
-		        <execution>
-		          <id>attach-javadocs</id>
-		          <goals>
-		            <goal>jar</goal>
-		          </goals>
-		        </execution>
-		      </executions>
-		    </plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-gpg-plugin</artifactId>
-				<version>1.5</version>
-				<executions>
-					<execution>
-						<id>sign-artifacts</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>sign</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>		    			
-		</plugins>
-	</build>
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.bstek.ureport</groupId>
+    <artifactId>ureport2-parent</artifactId>
+    <version>2.0.5</version>
+    <packaging>pom</packaging>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <licenses>
+        <license>
+            <name>The Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+    <developers>
+        <developer>
+            <name>Gaojie</name>
+            <email>jacky.gao@bstek.com</email>
+            <organization>Bstek</organization>
+            <organizationUrl>http://www.bstek.com</organizationUrl>
+        </developer>
+    </developers>
+    <scm>
+        <connection>https://github.com/youseries/ureport.git</connection>
+        <developerConnection>https://github.com/youseries/ureport.git</developerConnection>
+        <url>https://github.com/youseries/ureport</url>
+    </scm>
+    <organization>
+        <name>Bstek</name>
+        <url>http://www.bstek.com</url>
+    </organization>
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <resources>
+                    <resource>
+                        <directory>src/main/resources</directory>
+                        <includes>
+                            <include>**/*.jar</include>
+                            <include>**/*.xml</include>
+                            <include>**/*.xsd</include>
+                            <include>**/*.schemas</include>
+                            <include>**/*.handlers</include>
+                            <include>**/*.properties</include>
+                            <include>**/*.png</include>
+                            <include>**/*.jpg</include>
+                            <include>**/*.gif</include>
+                            <include>**/*.css</include>
+                            <include>**/*.js</include>
+                            <include>**/*.map</include>
+                            <include>**/*.swf</include>
+                            <include>**/*.swz</include>
+                            <include>**/*.html</include>
+                            <include>**/*.jsp</include>
+                            <include>**/*.txt</include>
+                            <include>**/*.eot</include>
+                            <include>**/*.svg</include>
+                            <include>**/*.ttf</include>
+                            <include>**/*.ttc</include>
+                            <include>**/*.TTF</include>
+                            <include>**/*.TTC</include>
+                            <include>**/*.woff</include>
+                            <include>**/*.md</include>
+                            <include>**/*.template</include>
+                        </includes>
+                    </resource>
+                    <resource>
+                        <directory>src/main/java</directory>
+                        <includes>
+                            <include>**/*.xml</include>
+                            <include>**/*.xsd</include>
+                            <include>**/*.schemas</include>
+                            <include>**/*.handlers</include>
+                            <include>**/*.properties</include>
+                            <include>**/*.png</include>
+                            <include>**/*.jpg</include>
+                            <include>**/*.gif</include>
+                            <include>**/*.css</include>
+                            <include>**/*.js</include>
+                            <include>**/*.map</include>
+                            <include>**/*.html</include>
+                            <include>**/*.jsp</include>
+                            <include>**/*.txt</include>
+                            <include>**/*.eot</include>
+                            <include>**/*.svg</include>
+                            <include>**/*.ttf</include>
+                            <include>**/*.ttc</include>
+                            <include>**/*.TTF</include>
+                            <include>**/*.TTC</include>
+                            <include>**/*.woff</include>
+                            <include>**/*.md</include>
+                            <include>**/*.template</include>
+                        </includes>
+                    </resource>
+                </resources>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <version>2.4</version>
+                        <configuration>
+                            <source>1.7</source>
+                            <target>1.7</target>
+                            <encoding>utf-8</encoding>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-release-plugin</artifactId>
+                        <version>2.5.3</version>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.sonatype.plugins</groupId>
+                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <version>1.6.7</version>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <serverId>ossrh</serverId>
+                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <version>2.2.1</version>
+                        <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>2.9.1</version>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.5</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+            <distributionManagement>
+                <snapshotRepository>
+                    <id>ossrh</id>
+                    <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+                </snapshotRepository>
+                <repository>
+                    <id>ossrh</id>
+                    <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+                </repository>
+            </distributionManagement>
+        </profile>
+    </profiles>
 
-	<distributionManagement>
-		<snapshotRepository>
-			<id>ossrh</id>
-			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-		<repository>
-			<id>ossrh</id>
-			<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
-		</repository>
-	</distributionManagement>
 
-	<name>UReport2 Parent Project</name>
-	<url>https://github.com/youseries/ureport/tree/master/ureport2-parent</url>
-	<issueManagement>
-		<url>${jira.browse.url}/VELOCITY</url>
-	</issueManagement>
-	<description>UReport2 Parent Project</description>
+
+    <name>UReport2 Parent Project</name>
+    <url>https://github.com/youseries/ureport/tree/master/ureport2-parent</url>
+    <issueManagement>
+        <url>${jira.browse.url}/VELOCITY</url>
+    </issueManagement>
+    <description>UReport2 Parent Project</description>
 </project>
\ No newline at end of file