Issue 365

@nevet 
As requested