Test

fixes #119
Merge pull request #120 from Kiroshima/master

Test