Added on show function
Merge branch 'feature'

Conflicts:
	main.js