Fixed #49 Fixed #48