Fixed Issue #21 on Master