Merge pull request #3 from haxmb/review

Merge 'review' branch in master
Merge pull request #4 from haxmb/review

Added some checkpoints for sync
Merge pull request #5 from haxmb/master

Bringing everything up to date