Version 0.2.0 and added tests