Issue #100 Fixed wrong import order Checkstyle error