Resolved issue #92 & #94

This pull request resolves issues #92 & #94.