Issue #15. Almost done. Need more testing and check if package is taken into account