Extensive work on 1.3.1;
Merge branch 'master' of https://github.com/ifdm/siphon