Whats new fixes

Includes changes from PR of @srinivasupadhya (#95) as well.