Merge pull request #6 from gheja/dev6
Merge branch 'master' of github.com:gheja/jsstuffs into dev6