updates
Merge pull request #3 from Karnith/dev

updates