Resolving Issue 2 from TODO_list
Merge branch 'v1.0.0'