Test fix
Test fix
Cleanup and updates
Merge pull request #1 from infinity-se/test

Merge test