Updates issue #13, #11, #3 closed