Packaged version changed to 0.3.3
regenerated with aclocal and automake
Merge branches 'dev' and 'master'