Misc
Merge branch 'master' of github.com:lukier/Pangolin