Indentation mixed due to different editors. Now using spaces of 2 for a tab.
Merge branch 'master' of https://github.com/paazmaya/naginata.fi