[master] Resolving #3