fixed bugs
Merge branch 'master' of github.com:evecalm/ratchet

Conflicts:
	dist/js/ratchet.min.js
	docs/dist/js/ratchet.min.js