First commit by @jlupi and @tombujok ;)