bugfix and refactoring
version for current release