diff --git a/Makefile b/Makefile
index efd842b..cb69e72 100644
--- a/Makefile
+++ b/Makefile
@@ -1,53 +1,9 @@
-ERLC_WARNINGS := -W1
-MNESIA_DIR := db
-RUN_INIT := -boot start_sasl  ##-run ezic_db init
-DEBUG := -DNODEBUG -Ddebug
-TEST := 
-TZSET := northamerica
-SHELL := /bin/bash
-COMPILE := ./src/*.erl
 
-all : clean compile
-
-
-nowarn : ERLC_WARNINGS = -W0
-nowarn : clean compile
-
-
-test : ERLC_WARNINGS := -W0
-test : TEST := -DTEST 
-test : RUN_INIT += -run test all -s erlang halt
-test : COMPILE += ./test/*.erl
-test : all run
-
-
-compile :
-	erlc $(DEBUG) $(TEST) $(ERLC_WARNINGS) $(OPTIONS) -o ./ebin $(COMPILE)
-	-erl -noshell -pa ebin -s erldev make_app . -s erlang halt
-
-clean : 
-	-@rm ebin/*
-	-@rm erl_crash.dump
-
-
-run :
-##	erl -pa ebin -mnesia dir $(MNESIA_DIR) $(RUN_INIT)
-	erl -pa ebin $(RUN_INIT)
-
-
-devstart : RUN_INIT += -s ezic dev -s erlang halt
-devstart : all run
-
-
-tzdata :
-	-cat priv/tzdata/$(TZSET)  | sed '/\s*\#/d' |  sed '/^\s*$$/d' | less -S
-
-
-diff :
-	-git diff > /tmp/ezic.tmp.diff
-	emacs /tmp/ezic.tmp.diff
-
-
-debug : DEBUG += +debug_info
-##debug : RUN_INIT += -s ezic dev
-debug : all run
\ No newline at end of file
+zones:
+	wget "http://www.iana.org/time-zones/repository/tzdata-latest.tar.gz"
+	mkdir -p priv/tzdata
+	tar -xvzf tzdata-latest.tar.gz -C priv/tzdata
+	rm tzdata-latest.tar.gz
+	ulimit -n 1024
+	erl -pa ebin -s ezic_generator generate -s erlang halt
+	erlc -o ebin zones/*.erl
diff --git a/rebar.config b/rebar.config
new file mode 100644
index 0000000..4659044
--- /dev/null
+++ b/rebar.config
@@ -0,0 +1,3 @@
+{post_hooks, [
+    {compile, "make zones"}
+]}.
diff --git a/src/ezic_loader.erl b/src/ezic_loader.erl
index b98eba3..1094c53 100644
--- a/src/ezic_loader.erl
+++ b/src/ezic_loader.erl
@@ -45,8 +45,11 @@ parse_dir(Dir) ->
 parse_file(File) ->
     error_logger:info_msg("Parsing File: ~p~n", [File]),
     {ok, FD} = file:open(File, [read]),
-    parse_lines(file:read_line(FD), FD, []).
-
+    try
+        parse_lines(file:read_line(FD), FD, [])
+    catch
+        _:_ -> []
+    end.