Incorporated Patrick's feedback comment on #211 and made maven build/dep-resolution atleast a bit faster.