diff --git a/CHANGELOG.md b/CHANGELOG.md
index 420b9f4..5473684 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log
 All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/).
 
+## [1.5.0] - 11.08.2020
+### Added
+- Section about current work
+- Option to keep end dates for work undefined
+
 ## [1.4.0] - 18.11.2019
 ### Added
 - Script to export to gh-pages
@@ -41,6 +46,7 @@ All notable changes to this project will be documented in this file. This change
 ### Added
 - Export to [json resume](jsonresume.org).
 
+[1.5.0]: https://github.com/scoiatael/resume/compare/v1.4.0...v1.5.0
 [1.4.0]: https://github.com/scoiatael/resume/compare/v1.3.3...v1.4.0
 [1.3.3]: https://github.com/scoiatael/resume/compare/v1.3.2...v1.3.3
 [1.3.2]: https://github.com/scoiatael/resume/compare/v1.3.1...v1.3.2
diff --git a/org/experience.org b/org/experience.org
index c5d5733..146d2a6 100644
--- a/org/experience.org
+++ b/org/experience.org
@@ -1,11 +1,15 @@
 * Experience
+** Opera AS
+    :FROM: 2020-01-13
+    :POSITION: DevOps @ Opera Statistics Platform
+    Developed and maintained metrics platform, gathering data from all of Opera products and processing them for both in-house consumption and exports.
 ** Tooploox
     :FROM: 2014-06-07
     :TO: 2019-10-31
     :POSITION: Senior Fullstack Developer
     Took part in explosive growth of the company. In the meantime built products with many startups and startup-like companies (listed underneath).
 ** One of major car manufacturers
-    :FROM: 2019-09-01
+:FROM: 2019-09-01
     :TO: 2019-10-31
     :POSITION: Freelance Researcher / Developer
     Proof-of-concept for API working in car's head unit, providing information about broadcasts based on car location.
diff --git a/resources/templates/resume.html b/resources/templates/resume.html
index aba3a58..6360475 100644
--- a/resources/templates/resume.html
+++ b/resources/templates/resume.html
@@ -1,4 +1,6 @@
 {% comment %}
+-*- engine:django -*-
+
 Based on https://github.com/bvosk/jsonresume-theme-pumpkin/blob/050a4c8/resume.hbs
 
 Copyright (c) 2019 Łukasz Czapliński
@@ -214,7 +216,7 @@ <h3>Work</h3>
 				<h4 class="strike-through">
 					<span>{{work.company}}</span>
 					<span class="date">
-						{{work.startDate|date:"MMM yyyy"}} — {{work.endDate|date:"MMM yyyy"}}
+						{{work.startDate|date:"MMM yyyy"}} — {{work.endDate|date:"MMM yyyy"|default:"now"}}
 					</span>
 				</h4>
 				{% with url=work.website %}
diff --git a/resources/templates/resume.tex b/resources/templates/resume.tex
index a5a5bf3..23655f9 100644
--- a/resources/templates/resume.tex
+++ b/resources/templates/resume.tex
@@ -54,7 +54,7 @@ \section{Languages}
 \end{multicols}
 \section{Work}
 <% for work in resume.work %>
-\datedsubsection{<{work.company}>}{<{work.startDate|date:"MMM yyyy"}> - <{work.endDate|date:"MMM yyyy"}>}
+\datedsubsection{<{work.company}>}{<{work.startDate|date:"MMM yyyy"}> - <{work.endDate|date:"MMM yyyy"|default:"now"}>}
 \subsubsection{<{ work.position}>}
 <{ work.summary|escape-tex }>
 <% if work.highlights|not-empty %>
diff --git a/src/resume/resume_json.clj b/src/resume/resume_json.clj
index 7a4bbd5..a9a19e8 100644
--- a/src/resume/resume_json.clj
+++ b/src/resume/resume_json.clj
@@ -3,7 +3,8 @@
 
 (defn parse-date
   [date]
-  (time/local-date "yyyy-MM-dd" date))
+  (if date
+    (time/local-date "yyyy-MM-dd" date)))
 
 (defn export-education
   "Convert org section about education into resume.json format"