Fixed #2
Changed terminology
Created workaround for issue #1