Fix program control output. Closes #16