Fixed the code
Merge pull request #36 from KellyBlack/Dev

Dev
Merge pull request #49 from amandagroccia/dev

Fixed the code