art 1.2.2
Merge branch 'master' of https://github.com/ifdm/siphon

Conflicts: