Extending http://piumarta.com/software/maru/