ascan method and structural additions
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
.idea deleted