* merge from Test to HungryChameleon
+ resources