Fixed a bug.
Merged bugfix into feature1
Feature 1 finished!!!!1