Merge remote-tracking branch 'origin/master' into josias
Updated JavaClient
Calculate instruction first, before updating map
Merge remote-tracking branch 'origin/master' into josias
Added comments for future work to be done
Merge remote-tracking branch 'origin/josias'