diff --git a/.fed b/.fed
new file mode 100644
index 0000000..66f39d1
--- /dev/null
+++ b/.fed
@@ -0,0 +1 @@
+editor=vim
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2c113b6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*~
+*.beam
+*.sw?
+deps/
+ebin/
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..19ab8eb
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,7 @@
+all: get-deps compile
+
+get-deps:
+	./rebar get-deps
+
+compile:
+	./rebar compile
diff --git a/rebar b/rebar
new file mode 100755
index 0000000..288059a
Binary files /dev/null and b/rebar differ
diff --git a/rebar.config b/rebar.config
new file mode 100644
index 0000000..bfda3d3
--- /dev/null
+++ b/rebar.config
@@ -0,0 +1,13 @@
+% vim:ts=4 sw=4 et ft=erlang
+{require_otp_vsn, "R13B04|R14|R15"}.
+
+{cover_enabled, true}.
+
+%{erl_opts, [debug_info,{i,"site/include"}]}.
+
+{deps_dir, ["deps"]}.
+
+{deps, [
+    {erlware_commons, ".*", {git, "git://github.com/erlware/erlware_commons.git", "HEAD"}},
+    {erlang_localtime, ".*", {git, "git://github.com/dmitryme/erlang_localtime.git", "HEAD"}}
+]}.
diff --git a/src/qdate.erl b/src/qdate.erl
index fa2d095..a2be8e3 100644
--- a/src/qdate.erl
+++ b/src/qdate.erl
@@ -32,7 +32,7 @@ parse(String) ->
 	to_date(String).
 
 nparse(String) ->
-	parse_to_now(String).
+	to_now(String).
 
 to_date(Unixtime) when is_integer(Unixtime) ->
 	unixtime_to_date(Unixtime);