Started merging;
Merge branch 'master' of https://github.com/ifdm/siphon
Merged 1.1.1-1.1.3;
Merge branch 'master' of https://github.com/ifdm/siphon
Merged 1.1.5-1.3.3;
Merge branch 'master' of https://github.com/ifdm/siphon
Demo can be completed; Needs checkpoints;
Merge branch 'master' of https://github.com/ifdm/siphon