Merge branch 'release/20130123' into develop
fixes #93, or it mostly should.
bumping release version
Merge branch 'release/20130123A'