Added controller needed for #14 and #13