Merge pull request #11 from andrewraynal/master

almost there
Merge pull request #12 from andrewraynal/master

closer
ajaxin