Version 0.6.4 - Issue #12