Issue 6 added
Merged with issue2