Fix #12 !
Fix #13 & Fix #15