Fixed bug in prepare stage + Improved problems fixing
Merge pull request #4 in XTRA/kaosv from develop to master

* commit '16358f91d9b35791ed4d742d61f8af2de28445fe':
  Fixed bug in prepare stage + Improved problems fixing