Add fixes identified
Merge pull request #64 from a5anka/M1_hakathon

Add fixes identified