Merge pull request #23 from Centril/master

Fix #8, Fix #20
fixed bug from last PR, externals now correct.
grunt build, refresh to latest.