Updates for issue 7, moved to version 2.3.0