Completed version 0.1