Ver: 0.2.6 /  Issue #1 Fixes