Name fix
fix conflicts, fix name
fix conflicts, fix name
Merge pull request #548 from hackiftekhar/master

Fix conflicts, fix name