Added helper
Fixed #4