Add some changes to #13