Merge pull request #28 from ohtu2014-halme/devel

Devel
Merge pull request #30 from ohtu2014-halme/devel

Devel