Issue/bug #17 resolved