Update 20140530
Move to root directory
Merge pull request #2 from sanemat/feature/update-2014-05-30

Feature/update 2014 05 30