Fixes #29. Somethin something everything
Merge conflicts