diff --git a/power-time/src/main/java/org/nanoboot/powerframework/time/duration/Duration.java b/power-time/src/main/java/org/nanoboot/powerframework/time/duration/Duration.java
index a5af6fe..8487a4e 100644
--- a/power-time/src/main/java/org/nanoboot/powerframework/time/duration/Duration.java
+++ b/power-time/src/main/java/org/nanoboot/powerframework/time/duration/Duration.java
@@ -42,6 +42,7 @@ public final class Duration {
     private static final String PLUS = "+";
     private static final String MINUS = "-";
     private static final String COLON = ":";
+    private static final String DOT = ".";
 
     /**
      *
@@ -275,7 +276,7 @@ public final class Duration {
      * @param string representing the new Duration
      */
     public Duration(String string) {
-        String[] splitString = string.split("\\:+");
+        String[] splitString = string.replace("\\.",":").split("\\:+");
         if(splitString.length != 5) {
             throw new TimeException("Input String has wrong format.");
         }
@@ -416,14 +417,14 @@ public final class Duration {
     @Override
     public String toString() {
         return StringUtils.appendObjects(this.isPositive() ? PLUS : MINUS,
-                get(TimeUnit.DAY),
+                String.format("%02d", get(TimeUnit.DAY)),
                 COLON,
-                get(TimeUnit.HOUR),
+                String.format("%02d", get(TimeUnit.HOUR)),
                 COLON,
-                get(TimeUnit.MINUTE),
+                String.format("%02d", get(TimeUnit.MINUTE)),
                 COLON,
-                get(TimeUnit.SECOND),
-                COLON,
-                get(TimeUnit.MILLISECOND));
+                String.format("%02d", get(TimeUnit.SECOND)),
+                DOT,
+                String.format("%03d", get(TimeUnit.MILLISECOND)));
     }
 }
diff --git a/power-time/src/main/java/org/nanoboot/powerframework/time/utils/RemainingTimeCalculator.java b/power-time/src/main/java/org/nanoboot/powerframework/time/utils/RemainingTimeCalculator.java
index cc356c2..f9e1e64 100644
--- a/power-time/src/main/java/org/nanoboot/powerframework/time/utils/RemainingTimeCalculator.java
+++ b/power-time/src/main/java/org/nanoboot/powerframework/time/utils/RemainingTimeCalculator.java
@@ -54,7 +54,8 @@ public class RemainingTimeCalculator {
 
     public long remainingSecondsUntilEnd() {
         long remains = this.total - this.done;
-        long remainsSeconds = (this.elapsedSecondSinceStart() / this.done) * remains;
+        double elapsedSecondSinceStartDouble = (double) elapsedSecondSinceStart();
+        long remainsSeconds = (long)((elapsedSecondSinceStartDouble / ((double)this.done)) * remains);
         return remainsSeconds;
     }