Fixes and modifications... Fixes #11