Update 2014-10-31
Merge pull request #7 from sanemat/feature/2014-10-31

Update 2014-10-31