Task #361

Added a test only and appears to work