Feature/moment js

Closes #29