First commit
Multiple bugs fixed
Merge branch 'geomtryostis/master'