implemented State class
using protected instead of friend
implemented dot method
Merge branches 'master' and 'dev/stijn'