Implementing issue #13