fixed https://github.com/shekhargulati/milestogo/issues/23 and https://github.com/shekhargulati/milestogo/issues/17