#345 First iteration ready for release