Development

Fixes #4 and Fixes #5 . Version 3.0.0