Issue354

@KingOfPoptart 

PR for issue 354.