fixed #37 and package naming issue