Resolves Issue #249 and #264