ENH: Addresses issue #55
Merging master back in