Feature/issue28

Attempting to resolve issue28.