Developer

fixes #7 and #2