Return instance instead of class
Version 0.1.0