Heavy improvements to 1.1.4;
Merge branch 'master' of https://github.com/ifdm/siphon