[Related to #16]