Implementation of version 0.1.5