Fixed deprecated issues

Fixed #11