Bundle 2014-01-12
Merge pull request #15 from sanemat/bundle/2014-01-12

Bundle 2014-01-12