Prepared code for first gem release