Implements and Fixes #1