added comments and fixed make_query helper method
debugged make_query
Merge branch 'master' of https://github.com/asgpng/COS-iw

Conflicts:
	iw.pyc