Fixed https://github.com/shekhargulati/milestogo/issues/4 and https://github.com/shekhargulati/milestogo/issues/102