diff -r 272b6f1d7dac -r 28dfd91a816c src/luan/LuanSource.java
--- a/src/luan/LuanSource.java	Fri Dec 28 19:48:43 2012 +0000
+++ b/src/luan/LuanSource.java	Fri Dec 28 20:43:06 2012 +0000
@@ -20,6 +20,9 @@
 				throw new NullPointerException("source is null");
 			this.source = source;
 			this.start = start;
+			while( Character.isWhitespace(source.text.charAt(end-1)) ) {
+				end--;
+			}
 			this.end = end;
 		}
 

diff -r 272b6f1d7dac -r 28dfd91a816c src/luan/interp/LuanParser.java
--- a/src/luan/interp/LuanParser.java	Fri Dec 28 19:48:43 2012 +0000
+++ b/src/luan/interp/LuanParser.java	Fri Dec 28 20:43:06 2012 +0000
@@ -162,16 +162,17 @@
 			FirstOf(
 				Sequence(
 					ExpList(),
-					EOI,
-					push( new ReturnStmt( se(start.get()), (Expressions)pop() ) )
+					push( new ReturnStmt( se(start.get()), (Expressions)pop() ) ),
+					push( newChunk(start.get()) ),
+					EOI
 				),
 				Sequence(
 					action( frame.isVarArg = true ),
 					Block(),
+					push( newChunk(start.get()) ),
 					EOI
 				)
-			),
-			push( newChunk(start.get()) )
+			)
 		);
 	}
 

diff -r 272b6f1d7dac -r 28dfd91a816c src/luan/lib/JavaLib.java
--- a/src/luan/lib/JavaLib.java	Fri Dec 28 19:48:43 2012 +0000
+++ b/src/luan/lib/JavaLib.java	Fri Dec 28 20:43:06 2012 +0000
@@ -187,11 +187,17 @@
 	}
 
 	public static Static getClass(LuanState luan,String name) throws LuanException {
+		Class cls;
 		try {
-			return new Static( Class.forName(name) );
+			cls = Class.forName(name);
 		} catch(ClassNotFoundException e) {
-			throw new LuanException(luan,LuanElement.JAVA,e);
+			try {
+				cls = Thread.currentThread().getContextClassLoader().loadClass(name);
+			} catch(ClassNotFoundException e2) {
+				throw new LuanException(luan,LuanElement.JAVA,e);
+			}
 		}
+		return new Static(cls);
 	}
 
 	public static void importClass(LuanState luan,String name) throws LuanException {

diff -r 272b6f1d7dac -r 28dfd91a816c src/luan/tools/WebShell.java
--- a/src/luan/tools/WebShell.java	Fri Dec 28 19:48:43 2012 +0000
+++ b/src/luan/tools/WebShell.java	Fri Dec 28 20:43:06 2012 +0000
@@ -27,7 +27,7 @@
 public class WebShell extends HttpServlet {
 	private static final Logger logger = LoggerFactory.getLogger(WebShell.class);
 
-	protected LuanState newLuanState() {
+	protected LuanState newLuanState() throws LuanException {
 		LuanState luan =  LuanCompiler.newLuanState();
 		BasicLib.register(luan);
 		JavaLib.register(luan);