Fixes #40 and #41. Thanks @vikhyat
Merge http://github.com/Kenshii/hummingbird