Changes and version bump to 0.05