Port of new code
Merge branch 'develop'

Conflicts:
	src/main/java/com/leozc/lantern/FindcallMojo.java