Fix for Issue #1

#1
@jpdevries