Get everything on the same page
Merge pull request #9 from Sylanz/sean

Get everything on the same page