Merge pull request #157 from atungare/dev

Dev