Merge pull request #19 from mehere/dev-wee

Pull Request from dev -> dev-wee on 5/2
Merge pull request #20 from mehere/dev

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