Merge pull request #972 from ismailsunni/fix_955

Fix 955
Tested under Ubuntu 12.04
Fix option dialog can't be opened.
Merge pull request #974 from akbargumbira/develop

Fix option dialog can't be opened.
Merge remote-tracking branch 'origin/develop' into fix_975