version 0.0.4
merge

Merge branch 'master' of github.com:wahani/aoos

Conflicts:
	DESCRIPTION