Bundle 2013-12-21
Merge pull request #6 from sanemat/bundle/2013-12-21

Bundle 2013-12-21