Refactoring
Merge ssov-master => #6