Develop ja

This time not a monster pull request ;)
Concerns issues:
#188 
#224
#288 
#293