credits redo 1.3
merge
Merge branch 'master' of https://github.com/ifdm/siphon