Changes resolving #2