remove deprecated warnings
Merge branch 'amplab'
Merge pull request #337 from jinntrance/master

Remove all the "Deprecated" warnings