Fix a bug #19
Fix a bug #21
Fix a bug #22
Merge pull request #23 from connect1ngdots/fix-bugs

Fix bugs