Merge pull request #27 from mariokonrad/master

Update to the latest and greatest of the SprDay Feb 2013