Issue #144 Removed static method