Cleaned up code
Merge branch 'Nikolai's-Branch'
Test