initial commit
easy bug fix :-)
Merge branch 'fix_bug'