Restored source from v0.1.6 merge issues