fixed first part of #174 - will add examples later