Small refactoring of method to prevent code being executed when it doesn't need to be
Upped version number with fixes; Added links to contributors