added controller methods, close #7