preperation for beta 2
Fix #41