Merge pull request #14 from ablesky/dev

Merge dev to master
Merge pull request #15 from ablesky/dev

Merge dev to master
a huge refact for ablejs