Fixed issues 2 and 3 on Github

Signed-off-by: Alex Dent <aldent95@hotmail.com>