new version 2.3

including matahume's changes