Update for 2014-11-28
Merge pull request #8 from sanemat/feature/2014-11-28

Update for 2014-11-28