* Improve solution * Uncomment code that has been commented due to slow execution affecting Travis * Retest