default constructor for acceptor + stuff
Merge fix
Merge branch 'master' of github.com:TIARDI/ARDI