Code format
Merge branch 'dev' of github.com:KSDaemon/wampy.js into dev

Conflicts:
	src/wampy.js