Refactor Supply

Almost fixed #81
gapShift()
Merge branch 'master' into gh-pages