0.03.6

Issue #2 fix