Bundle 2013-12-07
Merge pull request #2 from sanemat/bundle/2013-12-07

Bundle 2013-12-07