merged changes on issue#2
Merge branch 'issue#3'