Edit
Edit page
Merge pull request #1 from yoksel/master

Some changes