Merged Pull #16