diff --git a/src/ezic.app.src b/src/ezic.app.src
index 9ea1386..5d55e58 100644
--- a/src/ezic.app.src
+++ b/src/ezic.app.src
@@ -1,18 +1,10 @@
-{application, ezic,
- [
-  {registered, []},
-  {vsn, "0.2.0"},
-  {description, "A set of Erlang utilities for the Olson timezone database files"},
-  {applications, [
-                  kernel,
-                  stdlib
-                 ]},
-  {env, [{tzdata_dir, "priv/tzdata"}]},
-  {maintainers, ["Manuel Rubio"]},
-  {licenses, ["Public Domain"]},
-  {links, [
-    {"Github", "https://github.com/altenwald/ezic"}
-  ]},
-  {exclude_files, []},
-  {include_files, ["Makefile"]}
- ]}.
+{application,ezic,
+             [{registered,[]},
+              {vsn,"0.2.1"},
+              {description,"A set of Erlang utilities for the Olson timezone database files"},
+              {applications,[kernel,stdlib]},
+              {env,[{tzdata_dir,"priv/tzdata"}]},
+              {licenses,["Public Domain"]},
+              {links,[{"Github","https://github.com/altenwald/ezic"}]},
+              {exclude_files,["priv"]},
+              {include_files,["Makefile"]}]}.
diff --git a/src/ezic_date.erl b/src/ezic_date.erl
index 1fe6f31..c6bde9a 100644
--- a/src/ezic_date.erl
+++ b/src/ezic_date.erl
@@ -281,9 +281,19 @@ last_day_of(Day, Y,M) ->
 % returns a date tuple {Y,M,D} representing the first available date, given the filter
 % same for all timezones
 first_day_limited(Day, {geq, N}, Y,M) ->
-    next_day(Day, {Y,M,N});
+    try
+        next_day(Day, {Y,M,N})
+    catch
+        error:no_next_day ->
+            next_day(Day, {Y,M+1,1})
+    end;
 first_day_limited(Day, {leq, N}, Y,M) ->
-    previous_day(Day, {Y,M,N}).
+    try
+        previous_day(Day, {Y,M,N})
+    catch
+        error:no_previous_day ->
+            previous_day(Day, {Y, M-1, calendar:last_day_of_the_month(Y, M-1)})
+    end.