Added break and fixed serves bug. Resolves #18