.
merged changes on issue#2