Fixes #9 and added