Fix #1. Lets call this version 1.0