Fixed merging errors

first stable version

Bugfixes, created a label to keep track of versions

v1.0.1

v1, The base of the program