refactored stuff
Merge branch 'master' of https://github.com/antoniocapelo/awty

Conflicts:
	src/awty.js