kinabalu Merge pull request #44 from MalignantCarp/master