Final changes
Merge pull request #4 from susieye19/master

Final changes