Merge pull request #1 from xilix/master

at the begining it's only implemented in javascript