Fiksed feature #1.
Merge branch 'feature1-fix'