Merge branch 'release/0.3' into develop
for merge.
Merge branch 'master' of https://github.com/hkim0331/enq4 into develop

Conflicts:
	Makefile
context-path?
Merge branch 'develop'