Finializing 0.7.1 #2