Initial work for issue #13