Merging latest changes.

Hope this works the way I expect it to. "/