Uniform format
Adjusted basic structure, added connect
Merge branch 'master' into add-grunt