Last Changes

Partialy addresses #38 #36