Final Touches to 1.1.5 and 1.3.2
Merge branch 'master' of https://github.com/ifdm/siphon