latest commits

submitted to Elmer