Resolving issue #34 

Resolving issue #34