Corrected failing tests, some bug fixes. Comment before move is now parsed correctly.
Merge remote-tracking branch 'origin/master'