Fixes #3 and Fixed #16