Factlink/pavlov — pull request #20 by jjoos (2013-07-03 13:52:41+00:00)
Title: Merge develop into master, so we can remove the develop branch.

fixes #10