includes some bug-fixes, improvements and new features