Bundle 2013-12-16
Merge pull request #5 from sanemat/bundle/2013-12-16

Bundle 2013-12-16