Impl 409

Please preview and merge if appropiate