merging updates from nimbu.in