9 codeonline

pull fix for Issue #9 into next release