#17 bug catched
Merge pull request #18 from withmomo/feature/17

#17 bug catched