Continued refactoring + added scourcemaps.
Merge pull request #22 from szilardhuber/master

Continued refactoring + added scourcemaps.