Implementation of 1.2.3;

Status: Can be completed;
Merge branch 'master' of https://github.com/ifdm/siphon