Added fixes for issue #22