Started to implement issue #12.