fixes
fixes
Merge pull request #18 from murraju/dev

Dev