Fixes #12
Merge
Merge 2