Modified package to avoid double compilation, close #37