Fix/Enhancement #27

Pending further bugs