Merge pull request #2 from frankvollenweider/master

Changes from 2014-03-03