Development

solving issue #9 an #10. Ready for release.