Added second conditional statement, final commit of version 1.0