Adding more clear static method
Merging changes