Mechanical fixes; Super bounce fix potentially;
Merge branch 'master' of https://github.com/ifdm/siphon