Merge pull request #2 from amitraisharma/hf0.12

Hf0.12
Merge branch 'localmaster' into hf0.12