Merge branch 'master' of github.com:RMHogervorst/nsapi

# Conflicts:
#	DESCRIPTION