Updated constructor to fix issue #1.