resolve conflict
Merge pull request #73 from mehere/dev-wee

Resolve conflicts
Merge pull request #74 from mehere/dev

Pull Request from dev -> dev-wee on 2/3