added stricter dependencies
merging changes

Merge branch 'master' of https://github.com/laurieKell/aspic

Conflicts:
	NAMESPACE