Merge branch 'master' into dev-chris
Removed source maps.
Merge pull request #39 from chrishumboldt/dev-chris

Dev chris