Merge remote-tracking branch 'origin/master'
new version - more steps to a class, added messages and changed interface a bit
Merge remote-tracking branch 'origin/master'