Merge pull request #50 from depressiveRobot/atom-media-type