Resolve #75
Resolve #70
Resolve #76
Merge pull request #79 from vikramrajkumar/master

Issue fixes