diff --git a/akka-core/src/main/scala/util/Logging.scala b/akka-core/src/main/scala/util/Logging.scala
index 59f3848f5d..659b3afc7b 100644
--- a/akka-core/src/main/scala/util/Logging.scala
+++ b/akka-core/src/main/scala/util/Logging.scala
@@ -23,18 +23,18 @@ trait Logging {
 /**
  * Scala SLF4J wrapper
  *
- * ex.
- *
+ * Example:
+ * <pre>
  * class Foo extends Logging {
  *   log.info("My foo is %s","alive")
  *   log.error(new Exception(),"My foo is %s","broken")
  * }
+ * </pre>
  *
  * The logger uses String.format:
  * http://download-llnw.oracle.com/javase/6/docs/api/java/lang/String.html#format(java.lang.String,%20java.lang.Object...)
  */
-class Logger(val logger: SLFLogger)
-{
+class Logger(val logger: SLFLogger) {
   def name       = logger.getName
 
   def trace_?    = logger.isTraceEnabled
@@ -44,91 +44,89 @@ class Logger(val logger: SLFLogger)
   def error_?    = logger.isErrorEnabled
 
   //Trace
-  def trace(t: Throwable, fmt: => String, arg: Any, argN: Any*){
+  def trace(t: Throwable, fmt: => String, arg: Any, argN: Any*) {
     trace(t,message(fmt,arg,argN:_*))
   }
 
-  def trace(t: Throwable, msg: => String){
-    if(trace_?) logger.trace(msg,t)
+  def trace(t: Throwable, msg: => String) {
+    if (trace_?) logger.trace(msg,t)
   }
 
-  def trace(fmt: => String, arg: Any, argN: Any*){
+  def trace(fmt: => String, arg: Any, argN: Any*) {
      trace(message(fmt,arg,argN:_*))
   }
 
-  def trace(msg: => String){
-     if(trace_?) logger trace msg
+  def trace(msg: => String) {
+     if (trace_?) logger trace msg
   }
   //Debug
-  def debug(t: Throwable, fmt: => String, arg: Any, argN: Any*){
+  def debug(t: Throwable, fmt: => String, arg: Any, argN: Any*) {
     debug(t,message(fmt,arg,argN:_*))
   }
 
-  def debug(t: Throwable, msg: => String){
-    if(debug_?) logger.debug(msg,t)
+  def debug(t: Throwable, msg: => String) {
+    if (debug_?) logger.debug(msg,t)
   }
 
-  def debug(fmt: => String, arg: Any, argN: Any*){
+  def debug(fmt: => String, arg: Any, argN: Any*) {
      debug(message(fmt,arg,argN:_*))
   }
 
-  def debug(msg: => String){
-     if(debug_?) logger debug msg
+  def debug(msg: => String) {
+     if (debug_?) logger debug msg
   }
   //Info
-  def info(t: Throwable, fmt: => String, arg: Any, argN: Any*){
+  def info(t: Throwable, fmt: => String, arg: Any, argN: Any*) {
     info(t,message(fmt,arg,argN:_*))
   }
 
-  def info(t: Throwable, msg: => String){
-    if(info_?) logger.info(msg,t)
+  def info(t: Throwable, msg: => String) {
+    if (info_?) logger.info(msg,t)
   }
 
-  def info(fmt: => String, arg: Any, argN: Any*){
+  def info(fmt: => String, arg: Any, argN: Any*) {
      info(message(fmt,arg,argN:_*))
   }
 
-  def info(msg: => String){
-     if(info_?) logger info msg
+  def info(msg: => String) {
+     if (info_?) logger info msg
   }
   //Warning
-  def warning(t: Throwable, fmt: => String, arg: Any, argN: Any*){
+  def warning(t: Throwable, fmt: => String, arg: Any, argN: Any*) {
     warning(t,message(fmt,arg,argN:_*))
   }
 
-  def warning(t: Throwable, msg: => String){
-    if(warning_?) logger.warn(msg,t)
+  def warning(t: Throwable, msg: => String) {
+    if (warning_?) logger.warn(msg,t)
   }
 
-  def warning(fmt: => String, arg: Any, argN: Any*){
+  def warning(fmt: => String, arg: Any, argN: Any*) {
      warning(message(fmt,arg,argN:_*))
   }
 
-  def warning(msg: => String){
-     if(warning_?) logger warn msg
+  def warning(msg: => String) {
+     if (warning_?) logger warn msg
   }
   //Error
-  def error(t: Throwable, fmt: => String, arg: Any, argN: Any*){
+  def error(t: Throwable, fmt: => String, arg: Any, argN: Any*) {
     error(t,message(fmt,arg,argN:_*))
   }
 
-  def error(t: Throwable, msg: => String){
-    if(error_?) logger.error(msg,t)
+  def error(t: Throwable, msg: => String) {
+    if (error_?) logger.error(msg,t)
   }
 
-  def error(fmt: => String, arg: Any, argN: Any*){
+  def error(fmt: => String, arg: Any, argN: Any*) {
      error(message(fmt,arg,argN:_*))
   }
 
-  def error(msg: => String){
-     if(error_?) logger error msg
+  def error(msg: => String) {
+     if (error_?) logger error msg
   }
 
   protected def message(fmt: String, arg: Any, argN: Any*) : String = {
-    if((argN eq null) || argN.isEmpty)
-      fmt.format(arg)
-    else
-      fmt.format((arg +: argN):_*)
+    if ((argN eq null) || argN.isEmpty) fmt.format(arg)
+    else fmt.format((arg +: argN):_*)
   }
 }
 
@@ -142,17 +140,12 @@ class Logger(val logger: SLFLogger)
  * val rootLogger = Logger.root
  *
  */
-object Logger
-{
+object Logger {
   def apply(logger: String)  : Logger = new Logger(SLFLoggerFactory getLogger logger)
-
   def apply(clazz: Class[_]) : Logger = apply(clazz.getName)
-
   def root                   : Logger = apply(SLFLogger.ROOT_LOGGER_NAME)
 }
 
-
-
 /**
  * LoggableException is a subclass of Exception and can be used as the base exception
  * for application specific exceptions.
diff --git a/akka-core/src/test/scala/actor/typed-actor/TypedActorLifecycleSpec.scala b/akka-core/src/test/scala/actor/typed-actor/TypedActorLifecycleSpec.scala
index 2db8820f9c..10fc40493b 100644
--- a/akka-core/src/test/scala/actor/typed-actor/TypedActorLifecycleSpec.scala
+++ b/akka-core/src/test/scala/actor/typed-actor/TypedActorLifecycleSpec.scala
@@ -49,7 +49,7 @@ class TypedActorLifecycleSpec extends Spec with ShouldMatchers with BeforeAndAft
           assert(SamplePojoImpl._pre)
           assert(SamplePojoImpl._post)
           assert(!SamplePojoImpl._down)
-          assert(AspectInitRegistry.initFor(obj) ne null)
+//          assert(AspectInitRegistry.initFor(obj) ne null)
         }
       }
     }
@@ -69,7 +69,7 @@ class TypedActorLifecycleSpec extends Spec with ShouldMatchers with BeforeAndAft
           assert(!SamplePojoImpl._pre)
           assert(!SamplePojoImpl._post)
           assert(SamplePojoImpl._down)
-          assert(AspectInitRegistry.initFor(obj) eq null)
+ //         assert(AspectInitRegistry.initFor(obj) eq null)
         }
       }
     }
diff --git a/scripts/akka-init-script.sh b/scripts/akka-init-script.sh
new file mode 100644
index 0000000000..5a64ea5039
--- /dev/null
+++ b/scripts/akka-init-script.sh
@@ -0,0 +1,96 @@
+#! /bin/bash
+
+#Original /etc/init.d/skeleton modified for http://mydebian.blogdns.org 
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh
+script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="my cool akka app"
+NAME="cool"
+DAEMON=/usr/bin/java
+export AKKA_HOME=/var/.../servers/akka
+AKKA_JAR=$AKKA_HOME/akka.jar
+LOG4J=$AKKA_HOME/config/log4j.properties
+JVMFLAGS="-Xms512M -Xmx3072M -XX:+UseConcMarkSweepGC -
+Dlog4j.configuration=file://"$LOG4J
+DAEMON_ARGS=$JVMFLAGS" -jar "$AKKA_JAR
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+#the user that will run the script
+USER=cool-user
+VERBOSE=1
+
+# NO NEED TO MODIFY THE LINES BELOW
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+ start-stop-daemon --start --quiet -b -m -p $PIDFILE --exec $DAEMON --
+$DAEMON_ARGS \
+ || return 2
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+ start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
+ RETVAL="$?"
+ rm -f $PIDFILE
+ return "$RETVAL"
+}
+
+case "$1" in
+ start)
+ [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+ do_start
+ case "$?" in
+ 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+ 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ esac
+ ;;
+ stop)
+ [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+ do_stop
+ case "$?" in
+ 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+ 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+ esac
+ ;;
+ restart)
+ #
+ # If the "reload" option is implemented then remove the
+ # 'force-reload' alias
+ #
+ log_daemon_msg "Restarting $DESC" "$NAME"
+ do_stop
+ case "$?" in
+  0|1)
+ do_start
+ case "$?" in
+  0) log_end_msg 0 ;;
+  1) log_end_msg 1 ;; # Old process is still running
+  *) log_end_msg 1 ;; # Failed to start
+ esac
+ ;;
+  *)
+   # Failed to stop
+ log_end_msg 1
+ ;;
+ esac
+ ;;
+ *)
+ echo "Usage: $SCRIPTNAME {start|stop|restart}" >&2
+ exit 3
+ ;;
+esac
\ No newline at end of file