Merged github issue #13