Issue12

If there is anything else needed for this issue just ask and I'll work on it.