closes #157

Please merge vgadiyar-157