giving colin credit for else

including his thread on the forums
Merge commit '5ce201b5f834fca33344103551f34575db63c468' into current