Merge pull request #9 from stefanmendoza/Stefan

Fixed file issues