Added categories resolves #9