diff --git a/src/main/java/com/flowingcode/vaadin/addons/simpletimer/SimpleTimer.java b/src/main/java/com/flowingcode/vaadin/addons/simpletimer/SimpleTimer.java
index f1bb167..45302ab 100644
--- a/src/main/java/com/flowingcode/vaadin/addons/simpletimer/SimpleTimer.java
+++ b/src/main/java/com/flowingcode/vaadin/addons/simpletimer/SimpleTimer.java
@@ -127,7 +127,7 @@ public void reset() {
   /**
    * Returns the status of the timer
    *
-   * @return
+   * @return {@code true} if the timer is running, {@code false} otherwise.
    */
   @Synchronize(property = "isRunning", value = "is-running-changed")
   public boolean isRunning() {
@@ -190,7 +190,7 @@ public TimerEndedEvent(final SimpleTimer source, final boolean fromClient) {
    * Adds a timer ended listener that will be triggered when the timer reaches 0
    *
    * @param listener
-   * @return
+   * @return a handle that can be used for removing the listener
    */
   public Registration addTimerEndEvent(final ComponentEventListener<TimerEndedEvent> listener) {
     return addListener(TimerEndedEvent.class, listener);