v1.3
v1.4
Merge branch 'master' of https://github.com/starmap0312/my_preparser

Conflicts:
	my_preparser.py
	query_db.py