diff --git a/minari/css/minari.css b/minari/css/minari.css
index 1d6de5e..f66db3c 100644
--- a/minari/css/minari.css
+++ b/minari/css/minari.css
@@ -67,3 +67,7 @@ td {
 .today {
 	background-color: red;
 }
+
+.date-popover {
+    text-align: center;
+}
diff --git a/minari/images/0.png b/minari/images/0.png
new file mode 100644
index 0000000..ca66056
Binary files /dev/null and b/minari/images/0.png differ
diff --git a/minari/images/1.png b/minari/images/1.png
new file mode 100644
index 0000000..b04b7d3
Binary files /dev/null and b/minari/images/1.png differ
diff --git a/minari/images/10.png b/minari/images/10.png
new file mode 100644
index 0000000..75af837
Binary files /dev/null and b/minari/images/10.png differ
diff --git a/minari/images/11.png b/minari/images/11.png
new file mode 100644
index 0000000..5d62cff
Binary files /dev/null and b/minari/images/11.png differ
diff --git a/minari/images/12.png b/minari/images/12.png
new file mode 100644
index 0000000..cb8bb51
Binary files /dev/null and b/minari/images/12.png differ
diff --git a/minari/images/13.png b/minari/images/13.png
new file mode 100644
index 0000000..c75e877
Binary files /dev/null and b/minari/images/13.png differ
diff --git a/minari/images/14.png b/minari/images/14.png
new file mode 100644
index 0000000..c75e877
Binary files /dev/null and b/minari/images/14.png differ
diff --git a/minari/images/15.png b/minari/images/15.png
new file mode 100644
index 0000000..f8249d1
Binary files /dev/null and b/minari/images/15.png differ
diff --git a/minari/images/16.png b/minari/images/16.png
new file mode 100644
index 0000000..b73cfc1
Binary files /dev/null and b/minari/images/16.png differ
diff --git a/minari/images/17.png b/minari/images/17.png
new file mode 100644
index 0000000..77e44ee
Binary files /dev/null and b/minari/images/17.png differ
diff --git a/minari/images/18.png b/minari/images/18.png
new file mode 100644
index 0000000..8e4f866
Binary files /dev/null and b/minari/images/18.png differ
diff --git a/minari/images/19.png b/minari/images/19.png
new file mode 100644
index 0000000..92b24e9
Binary files /dev/null and b/minari/images/19.png differ
diff --git a/minari/images/2.png b/minari/images/2.png
new file mode 100644
index 0000000..bbf9ca4
Binary files /dev/null and b/minari/images/2.png differ
diff --git a/minari/images/20.png b/minari/images/20.png
new file mode 100644
index 0000000..8f6d2f8
Binary files /dev/null and b/minari/images/20.png differ
diff --git a/minari/images/21.png b/minari/images/21.png
new file mode 100644
index 0000000..d347f2c
Binary files /dev/null and b/minari/images/21.png differ
diff --git a/minari/images/22.png b/minari/images/22.png
new file mode 100644
index 0000000..41aae50
Binary files /dev/null and b/minari/images/22.png differ
diff --git a/minari/images/23.png b/minari/images/23.png
new file mode 100644
index 0000000..b8e02b4
Binary files /dev/null and b/minari/images/23.png differ
diff --git a/minari/images/24.png b/minari/images/24.png
new file mode 100644
index 0000000..58c190b
Binary files /dev/null and b/minari/images/24.png differ
diff --git a/minari/images/25.png b/minari/images/25.png
new file mode 100644
index 0000000..22a7506
Binary files /dev/null and b/minari/images/25.png differ
diff --git a/minari/images/26.png b/minari/images/26.png
new file mode 100644
index 0000000..f4f2b83
Binary files /dev/null and b/minari/images/26.png differ
diff --git a/minari/images/27.png b/minari/images/27.png
new file mode 100644
index 0000000..63c0cd5
Binary files /dev/null and b/minari/images/27.png differ
diff --git a/minari/images/3.png b/minari/images/3.png
new file mode 100644
index 0000000..a448bd8
Binary files /dev/null and b/minari/images/3.png differ
diff --git a/minari/images/4.png b/minari/images/4.png
new file mode 100644
index 0000000..df1c12e
Binary files /dev/null and b/minari/images/4.png differ
diff --git a/minari/images/5.png b/minari/images/5.png
new file mode 100644
index 0000000..61c555e
Binary files /dev/null and b/minari/images/5.png differ
diff --git a/minari/images/6.png b/minari/images/6.png
new file mode 100644
index 0000000..a116559
Binary files /dev/null and b/minari/images/6.png differ
diff --git a/minari/images/7.png b/minari/images/7.png
new file mode 100644
index 0000000..caecd36
Binary files /dev/null and b/minari/images/7.png differ
diff --git a/minari/images/8.png b/minari/images/8.png
new file mode 100644
index 0000000..339a032
Binary files /dev/null and b/minari/images/8.png differ
diff --git a/minari/images/9.png b/minari/images/9.png
new file mode 100644
index 0000000..57332cc
Binary files /dev/null and b/minari/images/9.png differ
diff --git a/minari/index.html b/minari/index.html
index 6747992..9def294 100644
--- a/minari/index.html
+++ b/minari/index.html
@@ -12,6 +12,9 @@
         <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
         <script type="text/javascript" src="js/minari.js"></script>
         <script type="text/javascript">
+            var year;
+            var inputActive = false;
+
             var today = new Date();
             today.setDate(today.getDate() + 11);
             var year, thisYear;
@@ -20,11 +23,7 @@
             var base_title = document.title;
 
             $(document).ready(function() {
-                setYear(year);
-
-                var inputActive = false;
-
-                $('#year').click(yearClick);
+                setYear();
 
                 $(document).click(function() {
                     if (inputActive) {
@@ -110,6 +109,8 @@
             </nav>
         </div>
         <script>
+            $('#year').click(yearClick);
+
             $('div.month').each(function() {
                 genMonthTable(this);
             });
diff --git a/minari/js/minari.js b/minari/js/minari.js
index 4af36f5..afaf216 100644
--- a/minari/js/minari.js
+++ b/minari/js/minari.js
@@ -22,6 +22,12 @@ var monthNames = new Array(
     'Rodom'
 );
 
+var newMoonBaseDate = new Date(2005, 4, 8, 3, 48);
+
+Date.prototype.getJulian = function() {
+    return Math.floor((this / 86400000) - (this.getTimezoneOffset()/1440) + 2440587.5);
+}
+
 /*
  * Add the getDOY() method to Date; it returns the day of year.
  */
@@ -148,6 +154,13 @@ Date.prototype.getMinariDate = function() {
 }
 
 function setYear(newYear) {
+    // If newYear is not set, go to current year
+    if (newYear == undefined) {
+        var today = new Date();
+        today.setDate(today.getDate() + 11);
+        newYear = Number(today.getFullYear() - 1873);
+    }
+
     year = newYear;
 
     document.title = year + ' – ' + base_title;
@@ -381,7 +394,13 @@ function getDayTooltip(month, day) {
 
     dayOneDate.setDate(dayOneDate.getDate() + dayNum - 1);
 
-    return dayOneDate.toLocaleDateString('hu-HU') + ((leapMorkh) ? '<br>(Két napos ünnep)' : '');
+    toolTip = $('<div>').addClass('date-popover').html(dayOneDate.toLocaleDateString('hu-HU') + ((leapMorkh) ? '<br>(Két napos ünnep)' : ''));
+
+    moonPhasePic = getMoonPhase(dayOneDate);
+    img = $('<img>').attr('src', 'images/' + moonPhasePic + '.png');
+    toolTip.append($('<br>')).append(img);
+
+    return toolTip;
 }
 
 function yearClick(e) {
@@ -412,3 +431,20 @@ function yearClick(e) {
         }
     });
 }
+
+function getMoonPhase(date) {
+    synodic = 29.53058867;
+    phasePercent = ((date.getJulian() - newMoonBaseDate.getJulian()) % synodic) / synodic;
+
+    if (phasePercent < 0) {
+        phasePercent += 1.0;
+    }
+
+    phase = Math.floor(28 * phasePercent);
+
+    if (phase == 28) {
+        phase = 0;
+    }
+
+    return phase;
+}