Fixed:
Issue #27