Sourcemaps
Proper names
Merge branch 'master' of github.com:rockerest/scheleton