Added basic gas pocket generation
Merge branch 'master' into 16