Working but has some bugs
Working
Merge pull request #1 from mzbenami/submission1

Submission1