Feature #50 incomplete but stable committing for release version