Only using discussed items. Should close #15
Merge pull request #17 from esKaayY/patch-1

Only using discussed items. Should close #15