Merge pull request #29 from absingla/master

Pull changes from absingla/third-party/master to absingla/third-party/sm