pading nightmare continued
Merge branch 'master' of github.com:scatnet/scatnet