bugfixing
Merge pull request #4 from keios/master

bugfixing