Feature/osx javalauncher enhance

Should fix #235 

Tested on clean vm of OSX 10.9.3