Added bugfix and new features