Merge pull request #2 from Winchestro/master

Merging to page