issues #3 and #4
Merge pull request #7 from jean-merelis/work

issues #3 and #4