Update to support TF2

Fixes #46
Merge pull request #47 from LucidOne/patch-1

Update to support TF2 manually tested on indigo with Ubuntu 14.04