Issues

Issue #34 resolved