release 9th june 2013: all new features go into master branch