All files related to Issue # 54

Please, take a look and let me know if any changes needs to be made