Changing structure to be more reusable
Little fix in function
Merge branch 'master' of github.com:marinho/go-website