Merge pull request #18 from aleibl/develop

Fixes 2013-12-09