@cdeil issue #18