Bundle 2013-12-15
Merge pull request #11 from sanemat/bundle/2013-12-15

Bundle 2013-12-15