Resolved Issue12 amd Issue13
Merge branch 'master' into Issue2